diff libpurple/Makefile.am @ 21563:1b174854bb80

merge of '30fcf2f336afb635b62a5c3ed3adb3e1fa1dd2d1' and 'bb60447c0a8c79afca320f4dc689096f4788e7fa'

--- a/libpurple/Makefile.am	Wed Nov 14 03:15:32 2007 +0000
+++ b/libpurple/Makefile.am	Sat Nov 17 01:55:21 2007 +0000
@@ -6,6 +6,7 @@
 		purple-send \
 		purple-send-async \
 		purple-url-handler \
+		purple.h.in \
 		purple.pc.in \
 		purple-uninstalled.pc.in \
 		version.h.in \
@@ -129,11 +130,12 @@
 	upnp.h \
 	util.h \
 	value.h \
-	version.h \
 	xmlnode.h \
 	whiteboard.h
 
-BUILT_SOURCES = version.h
+purple_builtheaders = purple.h version.h
+
+BUILT_SOURCES = $(purple_builtheaders)
 
 if ENABLE_DBUS
 
@@ -156,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)
@@ -183,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 >> $@
 
@@ -222,6 +225,7 @@
 libpurpleincludedir=$(includedir)/libpurple
 libpurpleinclude_HEADERS = \
 	$(purple_coreheaders) \
+	$(purple_builtheaders) \
 	$(dbus_headers)
 
 libpurple_la_DEPENDENCIES = $(STATIC_LINK_LIBS)