From: Thomas V. S. <tho...@us...> - 2003-01-29 00:03:52
|
CVS Root: /cvsroot/gstreamer Module: gst-plugins Changes by: thomasvs Date: Tue Jan 28 2003 16:03:51 PST Branch: BRANCH-GSTREAMER-0_6 Log message: fixing pkg-config stuff Modified files: . : Makefile.am pkgconfig : Makefile.am Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/Makefile.am.diff?r1=1.38.6.2&r2=1.38.6.3 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/pkgconfig/Makefile.am.diff?r1=1.1.2.1&r2=1.1.2.2 ====Begin Diffs==== Index: Makefile.am =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/Makefile.am,v retrieving revision 1.38.6.2 retrieving revision 1.38.6.3 diff -u -d -r1.38.6.2 -r1.38.6.3 --- Makefile.am 27 Jan 2003 15:27:57 -0000 1.38.6.2 +++ Makefile.am 29 Jan 2003 00:03:38 -0000 1.38.6.3 @@ -4,14 +4,6 @@ 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 @@ 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 Index: Makefile.am =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/pkgconfig/Attic/Makefile.am,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- Makefile.am 28 Jan 2003 20:22:11 -0000 1.1.2.1 +++ Makefile.am 29 Jan 2003 00:03:39 -0000 1.1.2.2 @@ -32,9 +32,6 @@ $(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) \ |