changeset 21514:aa89e649641a

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
author Stu Tomlinson <stu@nosnilmot.com>
date Thu, 15 Nov 2007 02:43:37 +0000
parents 7a9b8bd09a05
children 8f8883907f48
files libpurple/Makefile.am
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/Makefile.am	Thu Nov 15 02:22:02 2007 +0000
+++ b/libpurple/Makefile.am	Thu Nov 15 02:43:37 2007 +0000
@@ -115,7 +115,6 @@
 	privacy.h \
 	proxy.h \
 	prpl.h \
-	purple.h \
 	request.h \
 	roomlist.h \
 	savedstatuses.h \
@@ -131,11 +130,12 @@
 	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
 
@@ -158,7 +158,8 @@
                 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-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 @@
 libpurpleincludedir=$(includedir)/libpurple
 libpurpleinclude_HEADERS = \
 	$(purple_coreheaders) \
+	$(purple_builtheaders) \
 	$(dbus_headers)
 
 libpurple_la_DEPENDENCIES = $(STATIC_LINK_LIBS)