diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2003-04-27 15:20:07 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2003-04-27 15:20:07 +0000 |
| commit | 4ffaf1f8935d7e4e7c8b46b2630c98d59ba207b0 (patch) | |
| tree | 6288f18f5681d1109f303c09e8af32228568fdac | |
| parent | 5e5ec637577f8cd15c5bd9569edee8ed285a7bac (diff) | |
more uninstalled fixes
Original commit message from CVS:
more uninstalled fixes
| -rw-r--r-- | gst-libs/gst/gconf/Makefile.am | 2 | ||||
| -rw-r--r-- | pkgconfig/Makefile.am | 20 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-gconf-uninstalled.pc.in | 4 | ||||
| -rw-r--r-- | pkgconfig/gstreamer-play-uninstalled.pc.in | 4 |
4 files changed, 17 insertions, 13 deletions
diff --git a/gst-libs/gst/gconf/Makefile.am b/gst-libs/gst/gconf/Makefile.am index faec62223..a19987674 100644 --- a/gst-libs/gst/gconf/Makefile.am +++ b/gst-libs/gst/gconf/Makefile.am @@ -16,4 +16,6 @@ libgstgconf_@GST_MAJORMINOR@_la_LIBADD = $(GCONF_LIBS) $(GST_LIBS) libgstgconf_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) libgstgconf_@GST_MAJORMINOR@_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@ +CLEANFILES = gstreamer-gconf.pc gstreamer-gconf-uninstalled.pc + EXTRA_DIST = gstreamer-gconf.pc.in gstreamer-gconf-uninstalled.pc.in diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am index 7c136f27e..26e80bb15 100644 --- a/pkgconfig/Makefile.am +++ b/pkgconfig/Makefile.am @@ -14,21 +14,23 @@ pcfiles_uninstalled = \ gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc \ gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc -all-local: $(pcfiles) $(pcfiles_uninstalled) \ - $(GCONF_PC) \ - $(GCONF_PC_UNINSTALLED) +pcfiles_gconf = $(GCONF_PC) $(GCONF_PC_UNINSTALLED) +all-local: $(pcfiles) $(pcfiles_uninstalled) $(pcfiles_gconf) -### how to generate pc files +### how to generate pc files from .pc files in this dir $(pcfiles): %-@GST_MAJORMINOR@.pc: %.pc cp $< $@ $(pcfiles_uninstalled): %-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc cp $< $@ -gstreamer-gconf-@GST_MAJORMINOR@.pc: \ - $(srcdir)/../gst-libs/gst/gconf/gstreamer-gconf.pc - cp $< $@ -gstreamer-gconf-@GST_MAJORMINOR@-uninstalled.pc: \ - $(srcdir)/../gst-libs/gst/gconf/gstreamer-gconf-uninstalled.pc +### how to generate gconf dir pc files from their pc.in files +### somebody smart could figure out how to fold this back into one rule +$(srcdir)/../gst-libs/gst/gconf/gstreamer-gconf*.pc: + cd $(srcdir)/../gst-libs/gst/gconf && make gstreamer-gconf.pc gstreamer-gconf-uninstalled.pc + +### how to generate pc files from base .pc file in other dir +$(pcfiles_gconf): gstreamer-gconf-@GST_MAJORMINOR@%.pc: \ + $(srcdir)/../gst-libs/gst/gconf/gstreamer-gconf%.pc cp $< $@ pkgconfigdir = $(libdir)/pkgconfig diff --git a/pkgconfig/gstreamer-gconf-uninstalled.pc.in b/pkgconfig/gstreamer-gconf-uninstalled.pc.in index 932f3eb74..ad3439b48 100644 --- a/pkgconfig/gstreamer-gconf-uninstalled.pc.in +++ b/pkgconfig/gstreamer-gconf-uninstalled.pc.in @@ -9,5 +9,5 @@ Description: Streaming media framework, GConf support library, not installed Requires: gstreamer >= @VERSION@ Version: @VERSION@ -Libs: ${pcfiledir}/gst-libs/gst/gconf/libgstgconf-@GST_MAJORMINOR@.la -Cflags: -I${pcfiledir}/gst-libs +Libs: ${pcfiledir}/../gst-libs/gst/gconf/libgstgconf-@GST_MAJORMINOR@.la +Cflags: -I${pcfiledir}/../gst-libs diff --git a/pkgconfig/gstreamer-play-uninstalled.pc.in b/pkgconfig/gstreamer-play-uninstalled.pc.in index 0ed0a119a..6bc27e77e 100644 --- a/pkgconfig/gstreamer-play-uninstalled.pc.in +++ b/pkgconfig/gstreamer-play-uninstalled.pc.in @@ -6,8 +6,8 @@ includedir=${pcfiledir} Name: GStreamer Play Library, uninstalled Description: Streaming-media framework, play libraries, not installed -Requires: gstreamer >= @VERSION@ +Requires: gstreamer >= @VERSION@ gstreamer-control >= @VERSION@ Version: @VERSION@ -Libs: ${pcfiledir}/../gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la -lgstcontrol-@GST_MAJORMINOR@ +Libs: ${pcfiledir}/../gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la Cflags: -I${pcfiledir}/../gst-libs |