diff options
| author | Michael Ruprecht <maiku@pidgin.im> | 2009-10-28 22:18:08 +0000 |
|---|---|---|
| committer | Michael Ruprecht <maiku@pidgin.im> | 2009-10-28 22:18:08 +0000 |
| commit | 66843b8ab4e1a2a66c133b5d35b067c5233a11dc (patch) | |
| tree | 68fa69cc2f0d75115b877cf79f99bbbaff325503 | |
| parent | e59f7e2ff033dc6cc4a402315e6ae064d839b6c8 (diff) | |
| download | pidgin-66843b8ab4e1a2a66c133b5d35b067c5233a11dc.tar.gz | |
Change the libpurple Makefile to keep the same directory structure regarding
libpurple/media/ headers.
| -rw-r--r-- | libpurple/Makefile.am | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am index ad47f3f4bc..7abb829c89 100644 --- a/libpurple/Makefile.am +++ b/libpurple/Makefile.am @@ -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 @@ dbus_exported = dbus-useful.h dbus-define-api.h account.h blist.h buddyicon.h \ 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 @@ libpurple_client_la_LIBADD = $(DBUS_LIBS) 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 = \ |