cpw.maiku.media_refactor: 61686025: Change the libpurple Makefile to keep th...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: 6168602589bac5ec4dcc7e2e09165fa59be7225f
Ancestor: 2325fa71541af821ca10b88878b1d0e086af39d0
Author: maiku at pidgin.im
Date: 2009-10-28T22:18:08
Branch: im.pidgin.cpw.maiku.media_refactor
URL: http://d.pidgin.im/viewmtn/revision/info/6168602589bac5ec4dcc7e2e09165fa59be7225f

Modified files:
        libpurple/Makefile.am

ChangeLog: 

Change the libpurple Makefile to keep the same directory structure regarding
libpurple/media/ headers.

-------------- next part --------------
============================================================
--- libpurple/Makefile.am	31d40973608038c47a6260b0dddef24cf15ba11c
+++ libpurple/Makefile.am	f5bc64ea254dd2715a32a3b6b591c26a302c851e
@@ -121,10 +121,6 @@ purple_coreheaders = \
 	idle.h \
 	imgstore.h \
 	log.h \
-	media/backend-iface.h \
-	media/candidate.h \
-	media/codec.h \
-	media/enum-types.h \
 	media.h \
 	media-gst.h \
 	mediamanager.h \
@@ -165,6 +161,12 @@ purple_coreheaders = \
 	xmlnode.h \
 	whiteboard.h
 
+purple_mediaheaders = \
+	backend-iface.h \
+	candidate.h \
+	codec.h \
+	enum-types.h
+
 purple_builtheaders = purple.h version.h marshallers.h
 
 marshallers.h: marshallers.list
@@ -201,6 +203,7 @@ purple_build_coreheaders = $(addprefix $
                 savedstatuses.h smiley.h status.h server.h util.h xmlnode.h prpl.h
 
 purple_build_coreheaders = $(addprefix $(srcdir)/, $(purple_coreheaders)) \
+		$(addprefix $(srcdir)/media/, $(purple_mediaheaders)) \
 		$(purple_builtheaders)
 dbus_build_exported = $(addprefix $(srcdir)/, $(dbus_exported))
 # We should probably make this better
@@ -235,7 +238,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) $(purple_builtheaders) $(dbus_exported)
+purple-client-bindings.h: dbus-analyze-types.py dbus-analyze-functions.py $(purple_coreheaders) $(addprefix media/, $(purple_mediaheaders)) $(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 >> $@
 
@@ -293,6 +296,10 @@ libpurpleinclude_HEADERS = \
 	$(purple_builtheaders) \
 	$(dbus_headers)
 
+mediaincludedir=$(includedir)/libpurple/media
+mediainclude_HEADERS = \
+	$(addprefix $(srcdir)/media/, $(purple_mediaheaders))
+
 libpurple_la_DEPENDENCIES = $(STATIC_LINK_LIBS)
 libpurple_la_LDFLAGS = -export-dynamic -version-info $(PURPLE_LT_VERSION_INFO) -no-undefined
 libpurple_la_LIBADD = \