24 lines
1.6 KiB
Diff
24 lines
1.6 KiB
Diff
|
diff -Nura gpsd-2.95.orig/Makefile.in gpsd-2.95.x/Makefile.in
|
||
|
|
--- gpsd-2.95.orig/Makefile.in 2010-07-13 19:48:24.000000000 -0300
|
||
|
|
+++ gpsd-2.95.x/Makefile.in 2010-07-27 17:40:28.902568874 -0300
|
||
|
|
@@ -546,7 +546,7 @@
|
||
|
|
libgps_VERSION__REVISION = 0
|
||
|
|
libgps_VERSION_AGE = 0
|
||
|
|
libgps_VERSION_NUMBER = $(libgps_VERSION_AGE):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE)
|
||
|
|
-libgps_la_LDFLAGS = -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE)
|
||
|
|
+libgps_la_LDFLAGS = -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE) $(LDFLAGS)
|
||
|
|
lib_LTLIBRARIES = libgps.la libgpsd.la
|
||
|
|
libgps_SONAME = $(shell expr $(libgps_VERSION_CURRENT) - $(libgps_VERSION_AGE))
|
||
|
|
libgps_VERSION = $(libgps_SONAME).$(libgps_VERSION_AGE).$(libgps_VERSION__REVISION)
|
||
|
|
@@ -612,8 +612,8 @@
|
||
|
|
libgpsd_la_SOURCES = $(libgpsd_c_sources) $(libgpsd_h_sources) \
|
||
|
|
driver_rtcm2.h packet_states.h
|
||
|
|
|
||
|
|
-@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@
|
||
|
|
-@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@
|
||
|
|
+@LIBGPSMM_ENABLE_FALSE@libgps_la_LINK = /bin/sh ./libtool --tag=CC --mode=link $(CC) $(libgps_la_LDFLAGS) -o $@
|
||
|
|
+@LIBGPSMM_ENABLE_TRUE@libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link $(CXX) $(libgps_la_LDFLAGS) -o $@
|
||
|
|
nodist_libgpsd_la_SOURCES = packet_names.h ais_json.i
|
||
|
|
libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD)
|
||
|
|
libgpsd_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(LIBPTHREAD) $(BLUEZ_LIBS) libgps.la
|