Changeset View
Changeset View
Standalone View
Standalone View
astro/gpsbabel/files/patch-Makefile.in
- This file was added.
--- Makefile.in.orig | |||||
+++ Makefile.in | |||||
@@ -102,13 +102,10 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \ | |||||
SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o | |||||
-MINIZIP=zlib/contrib/minizip/zip.o \ | |||||
- zlib/contrib/minizip/ioapi.o | |||||
- | |||||
ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \ | |||||
zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \ | |||||
zlib/uncompr.o zlib/gzlib.o zlib/gzclose.o zlib/gzread.o \ | |||||
- zlib/gzwrite.o zlib/zutil.o $(MINIZIP) | |||||
+ zlib/gzwrite.o zlib/zutil.o | |||||
AMDmi3: Um, are you sure above changes are needed? It seems that with --with-zlib=sytem @ZLIB@ in… | |||||
AMDmi3Unsubmitted Done Inline ActionsMINIZIP= block may also be removed since it's only used in ZLIB which is not used. AMDmi3: MINIZIP= block may also be removed since it's only used in ZLIB which is not used. | |||||
LIBOBJS = queue.o route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \ | |||||
@@ -148,10 +145,10 @@ toolinfo | |||||
all: gpsbabel$(EXEEXT) | |||||
gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@ | |||||
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ | |||||
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) -lminizip @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ | |||||
gpsbabel-debug: $(OBJS) | |||||
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ | |||||
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) -lminizip @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ | |||||
Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \ | |||||
gbversion.h.in gui/setup.iss.in |
Um, are you sure above changes are needed? It seems that with --with-zlib=sytem @ZLIB@ in LIBOBJS is replaced with emptiness (instead of "${ZLIB}"), so this list of object files is not used at all, so it seems that you only need to add -lminizip