rpms/gpsd/devel gpsd.spec, 1.26, 1.27 parallel-make-dependencies.patch, 1.1, 1.2

Douglas E. Warner silfreed at fedoraproject.org
Wed Mar 25 13:17:30 UTC 2009


Author: silfreed

Update of /cvs/pkgs/rpms/gpsd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22142

Modified Files:
	gpsd.spec parallel-make-dependencies.patch 
Log Message:
updated build env in patch


Index: gpsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsd/devel/gpsd.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gpsd.spec	25 Mar 2009 12:59:39 -0000	1.26
+++ gpsd.spec	25 Mar 2009 13:16:59 -0000	1.27
@@ -75,9 +75,12 @@
 
 
 %build
-%configure --enable-dbus --disable-static
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%configure \
+	--disable-rpath \
+	--enable-dbus \
+	--disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ltmain.sh
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ltmain.sh
 make %{?_smp_mflags}
 
 

parallel-make-dependencies.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 parallel-make-dependencies.patch
Index: parallel-make-dependencies.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gpsd/devel/parallel-make-dependencies.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- parallel-make-dependencies.patch	25 Mar 2009 13:00:35 -0000	1.1
+++ parallel-make-dependencies.patch	25 Mar 2009 13:16:59 -0000	1.2
@@ -11510,7 +11510,7 @@
  #
 diff -ruN gpsd-2.39-orig/configure gpsd-2.39/configure
 --- gpsd-2.39-orig/configure	2009-03-18 17:10:31.000000000 -0400
-+++ gpsd-2.39/configure	2009-03-25 08:57:42.000000000 -0400
++++ gpsd-2.39/configure	2009-03-25 09:14:02.000000000 -0400
 @@ -1,9 +1,9 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -54501,9 +54501,673 @@
  
  echo "Configure finished, type 'make' to build."
  
+diff -ruN gpsd-2.39-orig/.deps/bits.Plo gpsd-2.39/.deps/bits.Plo
+--- gpsd-2.39-orig/.deps/bits.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/bits.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/bsd-base64.Plo gpsd-2.39/.deps/bsd-base64.Plo
+--- gpsd-2.39-orig/.deps/bsd-base64.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/bsd-base64.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/cgps.Po gpsd-2.39/.deps/cgps.Po
+--- gpsd-2.39-orig/.deps/cgps.Po	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/cgps.Po	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/crc24q.Plo gpsd-2.39/.deps/crc24q.Plo
+--- gpsd-2.39-orig/.deps/crc24q.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/crc24q.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/dgnss.Plo gpsd-2.39/.deps/dgnss.Plo
+--- gpsd-2.39-orig/.deps/dgnss.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/dgnss.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/dgpsip.Plo gpsd-2.39/.deps/dgpsip.Plo
+--- gpsd-2.39-orig/.deps/dgpsip.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/dgpsip.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/driver_aivdm.Plo gpsd-2.39/.deps/driver_aivdm.Plo
+--- gpsd-2.39-orig/.deps/driver_aivdm.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/driver_aivdm.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/driver_evermore.Plo gpsd-2.39/.deps/driver_evermore.Plo
+--- gpsd-2.39-orig/.deps/driver_evermore.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/driver_evermore.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/driver_garmin.Plo gpsd-2.39/.deps/driver_garmin.Plo
+--- gpsd-2.39-orig/.deps/driver_garmin.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/driver_garmin.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/driver_garmin_txt.Plo gpsd-2.39/.deps/driver_garmin_txt.Plo
+--- gpsd-2.39-orig/.deps/driver_garmin_txt.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/driver_garmin_txt.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/driver_italk.Plo gpsd-2.39/.deps/driver_italk.Plo
+--- gpsd-2.39-orig/.deps/driver_italk.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/driver_italk.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/driver_navcom.Plo gpsd-2.39/.deps/driver_navcom.Plo
+--- gpsd-2.39-orig/.deps/driver_navcom.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/driver_navcom.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/driver_nmea.Plo gpsd-2.39/.deps/driver_nmea.Plo
+--- gpsd-2.39-orig/.deps/driver_nmea.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/driver_nmea.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/driver_rtcm2.Plo gpsd-2.39/.deps/driver_rtcm2.Plo
+--- gpsd-2.39-orig/.deps/driver_rtcm2.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/driver_rtcm2.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/driver_rtcm3.Plo gpsd-2.39/.deps/driver_rtcm3.Plo
+--- gpsd-2.39-orig/.deps/driver_rtcm3.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/driver_rtcm3.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/driver_sirf.Plo gpsd-2.39/.deps/driver_sirf.Plo
+--- gpsd-2.39-orig/.deps/driver_sirf.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/driver_sirf.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/drivers.Plo gpsd-2.39/.deps/drivers.Plo
+--- gpsd-2.39-orig/.deps/drivers.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/drivers.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/driver_superstar2.Plo gpsd-2.39/.deps/driver_superstar2.Plo
+--- gpsd-2.39-orig/.deps/driver_superstar2.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/driver_superstar2.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/driver_tsip.Plo gpsd-2.39/.deps/driver_tsip.Plo
+--- gpsd-2.39-orig/.deps/driver_tsip.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/driver_tsip.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/driver_ubx.Plo gpsd-2.39/.deps/driver_ubx.Plo
+--- gpsd-2.39-orig/.deps/driver_ubx.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/driver_ubx.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/driver_zodiac.Plo gpsd-2.39/.deps/driver_zodiac.Plo
+--- gpsd-2.39-orig/.deps/driver_zodiac.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/driver_zodiac.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/geoid.Plo gpsd-2.39/.deps/geoid.Plo
+--- gpsd-2.39-orig/.deps/geoid.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/geoid.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/gpsctl.Po gpsd-2.39/.deps/gpsctl.Po
+--- gpsd-2.39-orig/.deps/gpsctl.Po	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/gpsctl.Po	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/gpsdclient.Plo gpsd-2.39/.deps/gpsdclient.Plo
+--- gpsd-2.39-orig/.deps/gpsdclient.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/gpsdclient.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/gpsd_dbus.Po gpsd-2.39/.deps/gpsd_dbus.Po
+--- gpsd-2.39-orig/.deps/gpsd_dbus.Po	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/gpsd_dbus.Po	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/gpsdecode.Po gpsd-2.39/.deps/gpsdecode.Po
+--- gpsd-2.39-orig/.deps/gpsdecode.Po	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/gpsdecode.Po	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/gpsd.Po gpsd-2.39/.deps/gpsd.Po
+--- gpsd-2.39-orig/.deps/gpsd.Po	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/gpsd.Po	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/gpsd_report.Plo gpsd-2.39/.deps/gpsd_report.Plo
+--- gpsd-2.39-orig/.deps/gpsd_report.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/gpsd_report.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/gpsflash.Po gpsd-2.39/.deps/gpsflash.Po
+--- gpsd-2.39-orig/.deps/gpsflash.Po	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/gpsflash.Po	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/gpsmon.Po gpsd-2.39/.deps/gpsmon.Po
+--- gpsd-2.39-orig/.deps/gpsmon.Po	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/gpsmon.Po	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/gpspipe.Po gpsd-2.39/.deps/gpspipe.Po
+--- gpsd-2.39-orig/.deps/gpspipe.Po	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/gpspipe.Po	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/gpsutils.Plo gpsd-2.39/.deps/gpsutils.Plo
+--- gpsd-2.39-orig/.deps/gpsutils.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/gpsutils.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/gpxlogger.Po gpsd-2.39/.deps/gpxlogger.Po
+--- gpsd-2.39-orig/.deps/gpxlogger.Po	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/gpxlogger.Po	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/hex.Plo gpsd-2.39/.deps/hex.Plo
+--- gpsd-2.39-orig/.deps/hex.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/hex.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/isgps.Plo gpsd-2.39/.deps/isgps.Plo
+--- gpsd-2.39-orig/.deps/isgps.Plo	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/isgps.Plo	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++# dummy
+diff -ruN gpsd-2.39-orig/.deps/lcdgps.Po gpsd-2.39/.deps/lcdgps.Po
+--- gpsd-2.39-orig/.deps/lcdgps.Po	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/.deps/lcdgps.Po	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
[...24650 lines suppressed...]
+-
++ at HAVE_XSLT_PROCESSOR_TRUE@BUILT_MANPAGES = $(MANPAGES_DIST)
+ noinst_HEADERS = driver_italk.h driver_rtcm2.h driver_superstar2.h \
+ 	driver_ubx.h gpsmon.h gpsdclient.h
+ 
+@@ -631,6 +656,7 @@
+ 	libgpsmm.xml \
+ 	gpsprof.xml \
+ 	gpsfake.xml \
++	gpscat.xml \
+ 	gpsctl.xml \
+ 	gpsmon.xml \
+ 	gpspipe.xml \
+@@ -638,7 +664,7 @@
+ 	rtcm-104.xml \
+ 	srec.xml \
+ 	gpsflash.xml \
+-	$(man_MANS) \
++	$(MANPAGES_DIST) \
+ 	xgps.ad \
+ 	xgpsspeed.ad \
+ 	gpsd.rules \
+@@ -657,10 +683,10 @@
+ 	libgps.pc.in \
+ 	libgpsd.pc.in \
+ 	gpscap.ini \
+-	contrib/* \
+-	packaging/*
++	packaging/etc_default_gpsd \
++	packaging/etc_init.d_gpsd \
++	packaging/etc_init.d_gpsd_rpm
+ 
+-CLEANFILES = $(BUILT_SOURCES) test_float *.core $(PYEXTENSIONS) $(BUILT_MANPAGES)
+ pkgconfig_DATA = libgps.pc libgpsd.pc
+ pkgconfigdir = $(libdir)/pkgconfig
+ 
+@@ -1374,6 +1400,9 @@
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
++	$(MAKE) $(AM_MAKEFLAGS) \
++	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
++	  dist-hook
+ 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+@@ -1527,7 +1556,7 @@
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-hdr distclean-libtool distclean-tags
++	distclean-hdr distclean-libtool distclean-local distclean-tags
+ 
+ dvi: dvi-am
+ 
+@@ -1595,29 +1624,30 @@
+ 	clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
+ 	clean-libLTLIBRARIES clean-libtool clean-local \
+ 	clean-sbinPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \
+-	dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
+-	distclean-compile distclean-generic distclean-hdr \
+-	distclean-libtool distclean-tags distcleancheck distdir \
+-	distuninstallcheck dvi dvi-am html html-am info info-am \
+-	install install-am install-binPROGRAMS install-data \
+-	install-data-am install-dist_binSCRIPTS install-dvi \
+-	install-dvi-am install-exec install-exec-am install-html \
+-	install-html-am install-includeHEADERS install-info \
+-	install-info-am install-libLTLIBRARIES install-man \
+-	install-man1 install-man3 install-man5 install-man8 \
+-	install-nodist_includeHEADERS install-nodist_pythonPYTHON \
+-	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
+-	install-ps-am install-pythonPYTHON install-sbinPROGRAMS \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \
+-	uninstall-includeHEADERS uninstall-libLTLIBRARIES \
+-	uninstall-man uninstall-man1 uninstall-man3 uninstall-man5 \
+-	uninstall-man8 uninstall-nodist_includeHEADERS \
+-	uninstall-nodist_pythonPYTHON uninstall-pkgconfigDATA \
+-	uninstall-pythonPYTHON uninstall-sbinPROGRAMS
++	dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \
++	distclean distclean-compile distclean-generic distclean-hdr \
++	distclean-libtool distclean-local distclean-tags \
++	distcleancheck distdir distuninstallcheck dvi dvi-am html \
++	html-am info info-am install install-am install-binPROGRAMS \
++	install-data install-data-am install-dist_binSCRIPTS \
++	install-dvi install-dvi-am install-exec install-exec-am \
++	install-html install-html-am install-includeHEADERS \
++	install-info install-info-am install-libLTLIBRARIES \
++	install-man install-man1 install-man3 install-man5 \
++	install-man8 install-nodist_includeHEADERS \
++	install-nodist_pythonPYTHON install-pdf install-pdf-am \
++	install-pkgconfigDATA install-ps install-ps-am \
++	install-pythonPYTHON install-sbinPROGRAMS install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-binPROGRAMS \
++	uninstall-dist_binSCRIPTS uninstall-includeHEADERS \
++	uninstall-libLTLIBRARIES uninstall-man uninstall-man1 \
++	uninstall-man3 uninstall-man5 uninstall-man8 \
++	uninstall-nodist_includeHEADERS uninstall-nodist_pythonPYTHON \
++	uninstall-pkgconfigDATA uninstall-pythonPYTHON \
++	uninstall-sbinPROGRAMS
+ 
+ 
+ packet_names.h: packet_states.h
+@@ -1629,8 +1659,23 @@
+ 	grep ENABLE gpsd_config.h >>gpsd.h
+ 	cat $(srcdir)/gpsd.h-tail >>gpsd.h
+ 
+- at HAVE_PYTHON_TRUE@gpspacket.so gpslib.so: gpspacket.c gpslib.c libgps.la
+- at HAVE_PYTHON_TRUE@	(pwd="`pwd`"; cd $(srcdir) && $(PYTHON) setup.py build_ext --build-lib "$$pwd" --build-temp "$$pwd/build" --include-dirs "$$pwd")
++# Multiple-outputs hack.  See
++# http://www.gnu.org/software/automake/manual/automake.html#Multiple-Outputs
++ at HAVE_PYTHON_TRUE@$(PYEXTENSIONS): stamp-python-modules
++ at HAVE_PYTHON_TRUE@	+ at WITNESS=stamp-python-modules; $(MULTIOUT_RECOVER_DELETED)
++# TODO:  Should the dependency on libgps.la be enforced inside
++# setup.py?  (See the variable 'needed_files' in setup.py.)
++ at HAVE_PYTHON_TRUE@stamp-python-modules: gpspacket.c gpslib.c libgps.la setup.py
++ at HAVE_PYTHON_TRUE@	@rm -f '$@' '$@.tmp'
++ at HAVE_PYTHON_TRUE@	@echo 'timestamp for $@' > '$@.tmp'
++ at HAVE_PYTHON_TRUE@	cd '$(srcdir)' && \
++ at HAVE_PYTHON_TRUE@	env abs_builddir='$(abs_builddir)' \
++ at HAVE_PYTHON_TRUE@	    MAKE='$(MAKE)' \
++ at HAVE_PYTHON_TRUE@		$(PYTHON) setup.py build_ext \
++ at HAVE_PYTHON_TRUE@			--build-lib '$(abs_builddir)' \
++ at HAVE_PYTHON_TRUE@			--build-temp '$(abs_builddir)/build' \
++ at HAVE_PYTHON_TRUE@			--include-dirs '$(abs_builddir):.'
++ at HAVE_PYTHON_TRUE@	@mv -f '$@.tmp' '$@'
+ # Clean up after Python
+ clean-local:
+ 	rm -rf build
+@@ -1647,35 +1692,20 @@
+ @HAVE_XSLT_PROCESSOR_TRUE at .xml.8:
+ @HAVE_XSLT_PROCESSOR_TRUE@	$(MANGENERATOR) $(MANFLAGS) $(MANTARGET) $<
+ 
+- at HAVE_XSLT_PROCESSOR_TRUE@gpsd.8: gpsd.xml
+-
+- at HAVE_XSLT_PROCESSOR_TRUE@gps.1 xgps.1 xgpsspeed.1 cgps.1 cgpxlogger.1: gps.xml
+-
+- at HAVE_XSLT_PROCESSOR_TRUE@libgps.3: libgps.xml
+-
+- at HAVE_XSLT_PROCESSOR_TRUE@libgpsmm.3: libgpsmm.xml
+-
+- at HAVE_XSLT_PROCESSOR_TRUE@libgpsd.3: libgpsd.xml
+-
+- at HAVE_XSLT_PROCESSOR_TRUE@gpsctl.1: gpsctl.xml
+-
+- at HAVE_XSLT_PROCESSOR_TRUE@gpscat.1: gpsctl.xml
+-
+- at HAVE_XSLT_PROCESSOR_TRUE@gpsprof.1: gpsprof.xml
+-
+- at HAVE_XSLT_PROCESSOR_TRUE@gpsfake.1: gpsfake.xml
+-
+- at HAVE_XSLT_PROCESSOR_TRUE@gpsmon.1: gpsmon.xml
+-
+- at HAVE_XSLT_PROCESSOR_TRUE@gpspipe.1: gpspipe.xml
+-
+- at HAVE_XSLT_PROCESSOR_TRUE@gpsdecode.1: gpsdecode.xml
+-
+- at HAVE_XSLT_PROCESSOR_TRUE@rtcm-104.5: rtcm-104.xml
+-
+- at HAVE_XSLT_PROCESSOR_TRUE@srec.5: srec.xml
+-
+- at HAVE_XSLT_PROCESSOR_TRUE@gpsflash.1: gpsflash.xml
++# Another instance of the multiple-outputs hack.
++ at HAVE_XSLT_PROCESSOR_TRUE@gps.1 xgps.1 xgpsspeed.1 cgps.1 lcdgps.1 cgpxlogger.1: stamp-gps-manpages
++ at HAVE_XSLT_PROCESSOR_TRUE@	+ at WITNESS=stamp-gps-manpages; $(MULTIOUT_RECOVER_DELETED)
++ at HAVE_XSLT_PROCESSOR_TRUE@stamp-gps-manpages: gps.xml
++ at HAVE_XSLT_PROCESSOR_TRUE@	@rm -f '$@' '$@.tmp'
++ at HAVE_XSLT_PROCESSOR_TRUE@	@echo 'timestamp for $@' > '$@.tmp'
++ at HAVE_XSLT_PROCESSOR_TRUE@	$(MANGENERATOR) $(MANFLAGS) $(MANTARGET) '$(srcdir)/gps.xml'
++ at HAVE_XSLT_PROCESSOR_TRUE@	@mv -f '$@.tmp' '$@'
++
++dist-hook:
++	$(MKDIR_P) '$(distdir)/contrib' && \
++	cp -p '$(srcdir)/contrib/'* '$(distdir)/contrib'
++distclean-local:
++	rm -rf '$(distdir)/contrib'
+ 
+ # These are not distributed
+ libgps: libgps.c .libs/libgps.a
+@@ -1809,7 +1839,7 @@
+ 
+ # Regression test the unpacking code in libgps
+ unpack-regress: libgps
+-	@echo "Testing the clent sentence unpacker..."
++	@echo "Testing the client-library sentence decoder..."
+ 	@$(srcdir)/libgps -u >test/test.chk
+ 	@diff -u test/unpack.chk test/test.chk
+ 
+diff -ruN gpsd-2.39-orig/stamp-h1 gpsd-2.39/stamp-h1
+--- gpsd-2.39-orig/stamp-h1	1969-12-31 19:00:00.000000000 -0500
++++ gpsd-2.39/stamp-h1	2009-03-25 09:14:23.000000000 -0400
+@@ -0,0 +1 @@
++timestamp for gpsd_config.h
+Binary files gpsd-2.39-orig/test_float and gpsd-2.39/test_float differ




More information about the fedora-extras-commits mailing list