diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2003-01-29 00:03:39 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2003-01-29 00:03:39 +0000 |
| commit | 4125b1a3a149b8d9f42888b06a39fed965b71832 (patch) | |
| tree | 9f71a6f5915c963bcf202ca05511312d599e37ce | |
| parent | 7786c9d322bc4790281ef7229f835cac8d7be3b7 (diff) | |
| download | gst-plugins-bad-4125b1a3a149b8d9f42888b06a39fed965b71832.tar.gz gst-plugins-bad-4125b1a3a149b8d9f42888b06a39fed965b71832.tar.bz2 gst-plugins-bad-4125b1a3a149b8d9f42888b06a39fed965b71832.zip | |
fixing pkg-config stuff
Original commit message from CVS:
fixing pkg-config stuff
| -rw-r--r-- | Makefile.am | 48 | ||||
| -rw-r--r-- | pkgconfig/Makefile.am | 3 |
2 files changed, 5 insertions, 46 deletions
diff --git a/Makefile.am b/Makefile.am index fb3fb4c1..a52f93b4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,14 +4,6 @@ else GCONF_DIR= endif -if USE_GCONF -GCONF_PC=gstreamer-gconf-@GST_MAJORMINOR@.pc -GCONF_PC_UNINSTALLED=gstreamer-gconf-@GST_MAJORMINOR@-uninstalled.pc -else -GCONF_PC= -GCONF_PC_UNINSTALLED= -endif - if BUILD_EXTERNAL EXT_DIR=ext else @@ -24,51 +16,21 @@ else EXAMPLES_DIR= endif -### all of the standard pc files we need to generate -pcfiles = \ - gstreamer-libs-@GST_MAJORMINOR@.pc \ - gstreamer-play-@GST_MAJORMINOR@.pc -pcfiles_uninstalled = \ - gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc \ - gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc - -all-local: $(pcfiles) $(pcfiles_uninstalled) \ - $(GCONF_PC) \ - $(GCONF_PC_UNINSTALLED) \ - gst-element-check-@GST_MAJORMINOR@.m4 - -### how to generate pc files -$(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 - cp $< $@ gst-element-check-@GST_MAJORMINOR@.m4: gst-element-check.m4 cp $(srcdir)/gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4 -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = \ - $(GCONF_PC) \ - gstreamer-libs-@GST_MAJORMINOR@.pc \ - gstreamer-play-@GST_MAJORMINOR@.pc - aclocaldir = $(datadir)/aclocal aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4 -SUBDIRS=gst-libs gst sys $(EXT_DIR) $(EXAMPLES_DIR) tools $(GCONF_DIR) testsuite +SUBDIRS=\ + gst-libs \ + gst sys $(EXT_DIR) \ + $(EXAMPLES_DIR) tools $(GCONF_DIR) testsuite pkgconfig -DIST_SUBDIRS=gst-libs gst sys ext examples tools gconf testsuite +DIST_SUBDIRS=gst-libs gst sys ext examples tools gconf testsuite pkgconfig EXTRA_DIST=gst-plugins.spec depcomp gst-element-check.m4 \ - gstreamer-libs.pc.in gstreamer-libs-uninstalled.pc.in \ - gstreamer-play.pc.in gstreamer-play-uninstalled.pc.in \ - gstreamer-gconf.pc.in gstreamer-gconf.pc-uninstalled.in \ AUTHORS COPYING README RELEASE REQUIREMENTS \ ChangeLog autogen.sh common m4 diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am index 80f11af1..ecc0dd37 100644 --- a/pkgconfig/Makefile.am +++ b/pkgconfig/Makefile.am @@ -32,9 +32,6 @@ gstreamer-gconf-@GST_MAJORMINOR@-uninstalled.pc: \ $(srcdir)/../gst-libs/gst/gconf/gstreamer-gconf-uninstalled.pc cp $< $@ -gst-element-check-@GST_MAJORMINOR@.m4: gst-element-check.m4 - cp $(srcdir)/gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4 - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = \ $(GCONF_PC) \ |