Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 94334
Collapse All | Expand All

(-)Makefile.in.orig (-4 / +11 lines)
Lines 56-67 Link Here
56
CXXFLAGS = @CXXFLAGS@
56
CXXFLAGS = @CXXFLAGS@
57
CYGPATH_W = @CYGPATH_W@
57
CYGPATH_W = @CYGPATH_W@
58
DATADIRNAME = @DATADIRNAME@
58
DATADIRNAME = @DATADIRNAME@
59
DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" -DLIBDIR=\"${libdir}\" -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" ${NOGARMIN} ${NOPLUGINS} ${USETELEATLAS}
59
DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" -DLIBDIR=\"${libdir}\" -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" ${NOGARMIN} ${NOPLUGINS} ${USETELEATLAS} ${NOGPSD}
60
DEPDIR = @DEPDIR@
60
DEPDIR = @DEPDIR@
61
DISABLEGARMIN_FALSE = @DISABLEGARMIN_FALSE@
61
DISABLEGARMIN_FALSE = @DISABLEGARMIN_FALSE@
62
DISABLEGARMIN_TRUE = @DISABLEGARMIN_TRUE@
62
DISABLEGARMIN_TRUE = @DISABLEGARMIN_TRUE@
63
DISABLEPLUGINS_FALSE = @DISABLEPLUGINS_FALSE@
63
DISABLEPLUGINS_FALSE = @DISABLEPLUGINS_FALSE@
64
DISABLEPLUGINS_TRUE = @DISABLEPLUGINS_TRUE@
64
DISABLEPLUGINS_TRUE = @DISABLEPLUGINS_TRUE@
65
DISABLEGPSD_FALSE = @DISABLEGPSD_FALSE@
66
DISABLEGPSD_TRUE = @DISABLEGPSD_TRUE@
65
ECHO = @ECHO@
67
ECHO = @ECHO@
66
ECHO_C = @ECHO_C@
68
ECHO_C = @ECHO_C@
67
ECHO_N = @ECHO_N@
69
ECHO_N = @ECHO_N@
Lines 93-98 Link Here
93
MSGMERGE = @MSGMERGE@
95
MSGMERGE = @MSGMERGE@
94
NOGARMIN = @NOGARMIN@
96
NOGARMIN = @NOGARMIN@
95
NOPLUGINS = @NOPLUGINS@
97
NOPLUGINS = @NOPLUGINS@
98
NOGPSD = @NOGPSD@
96
OBJEXT = @OBJEXT@
99
OBJEXT = @OBJEXT@
97
PACKAGE = @PACKAGE@
100
PACKAGE = @PACKAGE@
98
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
101
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
Lines 143-149 Link Here
143
host_vendor = @host_vendor@
146
host_vendor = @host_vendor@
144
147
145
148
146
# DEFS=@DEFS@ -I. -I$(srcdir) -I.. -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" -DLIBDIR=\"${libdir}\" -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" ${NOGARMIN} ${NOPLUGINS} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED 
149
# DEFS=@DEFS@ -I. -I$(srcdir) -I.. -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" -DLIBDIR=\"${libdir}\" -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" ${NOGARMIN} ${NOPLUGINS} ${NOGPSD} -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED 
147
includedir = mysql
150
includedir = mysql
148
infodir = @infodir@
151
infodir = @infodir@
149
install_sh = @install_sh@
152
install_sh = @install_sh@
Lines 160-168 Link Here
160
sysconfdir = @sysconfdir@
163
sysconfdir = @sysconfdir@
161
target_alias = @target_alias@
164
target_alias = @target_alias@
162
@DISABLEGARMIN_FALSE@PRG1 = garble
165
@DISABLEGARMIN_FALSE@PRG1 = garble
163
164
@DISABLEGARMIN_TRUE@PRG1 = 
166
@DISABLEGARMIN_TRUE@PRG1 = 
165
bin_PROGRAMS = $(PRG1) gpsdrive gpsd  friendsd2 
167
@DISABLEGPSD_FALSE@GPSD = gpsd
168
@DISABLEGPSD_TRUE@GPSD = 
169
bin_PROGRAMS = $(PRG1) gpsdrive $(GPSD)  friendsd2 
166
@ENABLETELEATLAS_FALSE@GPSNAVLIB = 
170
@ENABLETELEATLAS_FALSE@GPSNAVLIB = 
167
171
168
@ENABLETELEATLAS_TRUE@GPSNAVLIB = -lgpsnavlib
172
@ENABLETELEATLAS_TRUE@GPSNAVLIB = -lgpsnavlib
Lines 192-197 Link Here
192
@DISABLEGARMIN_FALSE@PRGS = gpsdrive.c splash.c navigation.c speech_out.c friends.c battery.c track.c settings.c  power.h battery.h track.h gpsdrive.h garmin_data.cpp garmin_serial_unix.cpp garmin_application.cpp garmin_link.cpp garmin_util.cpp gpsdrivegarble.cpp garmin_legacy.cpp garmin_link.h    garmin_serial_unix.h garmin_application.h garmin_packet.h  garmin_types.h garmin_command.h garmin_phys.h garmin_util.h garmin_error.h garmin_serial.h gpssql.c gpskismet.c ../config.h icons.h garmin_legacy.h garmin_data.h gettext.h LatLong-UTMconversion.c LatLong-UTMconversion.h compass.h gpsserial.c gpsnasamap.c gpsmisc.c gpsproto.h talogo.h
196
@DISABLEGARMIN_FALSE@PRGS = gpsdrive.c splash.c navigation.c speech_out.c friends.c battery.c track.c settings.c  power.h battery.h track.h gpsdrive.h garmin_data.cpp garmin_serial_unix.cpp garmin_application.cpp garmin_link.cpp garmin_util.cpp gpsdrivegarble.cpp garmin_legacy.cpp garmin_link.h    garmin_serial_unix.h garmin_application.h garmin_packet.h  garmin_types.h garmin_command.h garmin_phys.h garmin_util.h garmin_error.h garmin_serial.h gpssql.c gpskismet.c ../config.h icons.h garmin_legacy.h garmin_data.h gettext.h LatLong-UTMconversion.c LatLong-UTMconversion.h compass.h gpsserial.c gpsnasamap.c gpsmisc.c gpsproto.h talogo.h
193
197
194
@DISABLEGARMIN_TRUE@PRGS = gpsdrive.c splash.c navigation.c speech_out.c friends.c battery.c track.c settings.c  power.h battery.h track.h gpsdrive.h gpssql.c gpskismet.c ../config.h icons.h gettext.h LatLong-UTMconversion.c LatLong-UTMconversion.h compass.h gpsserial.c gpsnasamap.c gpsmisc.c gpsproto.h talogo.h
198
@DISABLEGARMIN_TRUE@PRGS = gpsdrive.c splash.c navigation.c speech_out.c friends.c battery.c track.c settings.c  power.h battery.h track.h gpsdrive.h gpssql.c gpskismet.c ../config.h icons.h gettext.h LatLong-UTMconversion.c LatLong-UTMconversion.h compass.h gpsserial.c gpsnasamap.c gpsmisc.c gpsproto.h talogo.h
199
@DISABLEGPSD_TRUE@PRGS = gpsdrive.c splash.c navigation.c speech_out.c friends.c battery.c track.c settings.c  power.h battery.h track.h gpsdrive.h gpssql.c gpskismet.c ../config.h icons.h gettext.h LatLong-UTMconversion.c LatLong-UTMconversion.h compass.h gpsserial.c gpsnasamap.c gpsmisc.c gpsproto.h talogo.h
195
gpsdrive_SOURCES = $(PRGS)
200
gpsdrive_SOURCES = $(PRGS)
196
201
197
@DISABLEGARMIN_FALSE@garble_SOURCES = garble.cpp garmin_legacy.cpp garmin_data.cpp garmin_serial_unix.cpp garmin_application.cpp garmin_link.cpp garmin_util.cpp
202
@DISABLEGARMIN_FALSE@garble_SOURCES = garble.cpp garmin_legacy.cpp garmin_data.cpp garmin_serial_unix.cpp garmin_application.cpp garmin_link.cpp garmin_util.cpp
Lines 228-233 Link Here
228
libnautic_la_OBJECTS = $(am_libnautic_la_OBJECTS)
233
libnautic_la_OBJECTS = $(am_libnautic_la_OBJECTS)
229
@DISABLEGARMIN_TRUE@bin_PROGRAMS = gpsdrive$(EXEEXT) gpsd$(EXEEXT) \
234
@DISABLEGARMIN_TRUE@bin_PROGRAMS = gpsdrive$(EXEEXT) gpsd$(EXEEXT) \
230
@DISABLEGARMIN_TRUE@	friendsd2$(EXEEXT)
235
@DISABLEGARMIN_TRUE@	friendsd2$(EXEEXT)
236
@DISABLEGPSD_TRUE@bin_PROGRAMS = gpsdrive$(EXEEXT) \
237
@DISABLEGPSD_TRUE@	friendsd2$(EXEEXT)
231
@DISABLEGARMIN_FALSE@bin_PROGRAMS = garble$(EXEEXT) gpsdrive$(EXEEXT) \
238
@DISABLEGARMIN_FALSE@bin_PROGRAMS = garble$(EXEEXT) gpsdrive$(EXEEXT) \
232
@DISABLEGARMIN_FALSE@	gpsd$(EXEEXT) friendsd2$(EXEEXT)
239
@DISABLEGARMIN_FALSE@	gpsd$(EXEEXT) friendsd2$(EXEEXT)
233
PROGRAMS = $(bin_PROGRAMS)
240
PROGRAMS = $(bin_PROGRAMS)
(-)Makefile.am.orig (-1 / +6 lines)
Lines 9-15 Link Here
9
else 
9
else 
10
PRG1=garble
10
PRG1=garble
11
endif
11
endif
12
bin_PROGRAMS = $(PRG1) gpsdrive gpsd  friendsd2 
12
if DISABLEGPSD
13
GPSD=
14
else 
15
GPSD=gpsd
16
endif
17
bin_PROGRAMS = $(PRG1) gpsdrive $(GPSD)  friendsd2 
13
LIBS=
18
LIBS=
14
19
15
if ENABLETELEATLAS
20
if ENABLETELEATLAS

Return to bug 94334