diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2010-04-13 17:34:17 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2010-04-13 17:34:17 -0400 |
| commit | 3039ba6573d8a740cacb79c64755f1101612df35 (patch) | |
| tree | 7fe29f5a4eb3ccf50020f7c62d85ab04f1f3d2d0 /Makefile.am | |
| parent | 65b7d107cf6aca1220fdfae358ddcb8e88a1cb42 (diff) | |
| download | gpsd-3039ba6573d8a740cacb79c64755f1101612df35.tar.gz | |
Another minor autotools tweak, not required for productuin builds yet.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index af48a437..e0837275 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,8 +41,10 @@ if HAVE_XAW XAW_PROGS = xgpsspeed endif +# Conditional includes. +INCLUDES = $(INCUSB) if HAVE_DBUS -INCLUDES = $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) -DDBUS_API_SUBJECT_TO_CHANGE=1 +INCLUDES += $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) -DDBUS_API_SUBJECT_TO_CHANGE=1 endif RTCM104PAGES_DIST = gpsdecode.1 @@ -100,7 +102,6 @@ gpxlogger_LDADD = $(DBUS_GLIB_LIBS) libgps.la -lm # Build gpsd # gpsd_c_sources = gpsd_dbus.c gpsd.c -gpsd_CFLAGS = $(INCUSB) gpsd_SOURCES = $(gpsd_c_sources) gpsd_dbus.h gpsd_LDADD = $(DBUS_LIBS) $(LIBM) libgps.la -lm $(LIBPTHREAD) $(LIBUSB) |