im.pidgin.pidgin: 01ae4afc8b6a09c0c9c55fdf7bb45096f0a13f6d

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 01ae4afc8b6a09c0c9c55fdf7bb45096f0a13f6d
Ancestor: 934ad0f4293e44096b06941bb9a03b8f82336e10
Author: nosnilmot at pidgin.im
Date: 2007-11-15T02:43:37
Branch: im.pidgin.pidgin

Modified files:
        libpurple/Makefile.am

ChangeLog: 

Fix building outside of the source directory. This is derived from the
patch on ticket 3864 from Bjoern, but reworked to be more generic so
hopefully we don't break this again.

Fixes: #3864


-------------- next part --------------
============================================================
--- libpurple/Makefile.am	8f401b067bea264d540c6498bc4d02f362716ffe
+++ libpurple/Makefile.am	2112ccec7c2eda63afa57cf4f0c7bbff8347dc42
@@ -115,7 +115,6 @@ purple_coreheaders = \
 	privacy.h \
 	proxy.h \
 	prpl.h \
-	purple.h \
 	request.h \
 	roomlist.h \
 	savedstatuses.h \
@@ -131,12 +130,13 @@ purple_coreheaders = \
 	upnp.h \
 	util.h \
 	value.h \
-	version.h \
 	xmlnode.h \
 	whiteboard.h
 
-BUILT_SOURCES = purple.h version.h
+purple_builtheaders = purple.h version.h
 
+BUILT_SOURCES = $(purple_builtheaders)
+
 if ENABLE_DBUS
 
 CLEANFILES = \
@@ -158,7 +158,8 @@ dbus_exported = dbus-useful.h dbus-defin
                 connection.h conversation.h core.h ft.h log.h notify.h prefs.h roomlist.h \
                 savedstatuses.h status.h server.h util.h xmlnode.h
 
-purple_build_coreheaders = $(addprefix $(srcdir)/, $(purple_coreheaders))
+purple_build_coreheaders = $(addprefix $(srcdir)/, $(purple_coreheaders)) \
+		$(purple_builtheaders)
 dbus_build_exported = $(addprefix $(srcdir)/, $(dbus_exported))
 
 dbus-types.c: dbus-analyze-types.py $(purple_build_coreheaders)
@@ -185,7 +186,7 @@ purple-client-bindings.c: dbus-analyze-f
 purple-client-bindings.c: dbus-analyze-functions.py $(dbus_exported)
 	cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@
 
-purple-client-bindings.h: dbus-analyze-types.py dbus-analyze-functions.py $(purple_coreheaders) $(dbus_exported)
+purple-client-bindings.h: dbus-analyze-types.py dbus-analyze-functions.py $(purple_coreheaders) $(purple_builtheaders) $(dbus_exported)
 	cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --keyword=enum --verbatim > $@
 	cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client --headers >> $@
 
@@ -224,6 +225,7 @@ libpurpleinclude_HEADERS = \
 libpurpleincludedir=$(includedir)/libpurple
 libpurpleinclude_HEADERS = \
 	$(purple_coreheaders) \
+	$(purple_builtheaders) \
 	$(dbus_headers)
 
 libpurple_la_DEPENDENCIES = $(STATIC_LINK_LIBS)