From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Wed, 10 Nov 2004 14:57:16 +0000 (+0000)
Subject: Separate out usb gorp so it can be turned off more independently.
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~11^2~3867
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0132217e8f662bc0f9eb4ae54a828797991dcb55;p=gpsbabel.git

Separate out usb gorp so it can be turned off more independently.
---

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index 970258f55..70820dc64 100644
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -3,12 +3,13 @@
 # type that is XML-ish (i.e. gpx or geocaching.com's/loc) you can uncomment
 # INHIBIT_EXPAT and coment out LIBEXPAT on just to get a build working quickly.
 # INHIBIT_EXPAT=-DNO_EXPAT
-LIBEXPAT=-lexpat -lusb # -lefence
+LIBEXPAT=-lexpat #-lefence
 
 # USB may required non-standard libraries (like libusb) be installed
 # and may not be available on all OSes.  Uncomment this to remove the key
 # parts of USB from the build.
 INHIBIT_USB=#-DNO_USB
+LIBUSB=-lusb
 
 #
 # Enable either or both of these as you wish.
@@ -54,7 +55,7 @@ OBJS = main.o $(LIBOBJS)
 all: gpsbabel
 
 gpsbabel: $(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) -o gpsbabel $(LIBEXPAT) -lm
+	$(CC) $(CFLAGS) $(OBJS) -o gpsbabel $(LIBEXPAT) $(LIBUSB) -lm
 
 main.o:
 	$(CC) -c $(CFLAGS) -DVERSION=\"$(VERSIOND)\" $<
@@ -108,7 +109,7 @@ release:
 	curl -u anonymous:anonymous --upload-file /tmp/gpsbabel-$(VERSIOND).zip ftp://upload.sf.net/incoming/
 
 mac-build:
-	make LIBEXPAT=/sw/lib/libexpat.a EXTRA_CFLAGS="-I/sw/include"
+	make LIBEXPAT=/sw/lib/libexpat.a EXTRA_CFLAGS="-I/sw/include" LIBUSB= INHIBIT_USB=-DNO_USB
 
 mac-release:
 	mkdir -p usr/bin usr/share/gpsbabel/doc