Binary files gdal16/.DS_Store and gdal16-090507/.DS_Store differ diff -ur gdal16/GDALmake.opt.in gdal16-090507/GDALmake.opt.in --- gdal16/GDALmake.opt.in 2009-05-07 16:25:34.000000000 -0500 +++ gdal16-090507/GDALmake.opt.in 2009-05-07 17:12:46.000000000 -0500 @@ -13,8 +13,10 @@ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install LIBTOOL_FINISH = $(LIBTOOL) --mode=finish --silent LIBTOOL_CLEAN = $(LIBTOOL) --mode=clean +OBJ_EXT = lo else LIBTOOL_FINISH = @BINTRUE@ +OBJ_EXT = o endif CC = $(LIBTOOL_COMPILE_CC) @CC@ @@ -375,16 +377,16 @@ O_OBJ = $(foreach file,$(OBJ),../o/$(file)) -../o/%.o: %.c +../o/%.$(OBJ_EXT): %.c $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< -../o/%.o: %.cpp +../o/%.$(OBJ_EXT): %.cpp $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< -%.o: %.c +%.$(OBJ_EXT): %.c $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< -%.o: %.cpp +%.$(OBJ_EXT): %.cpp $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< # diff -ur gdal16/alg/GNUmakefile gdal16-090507/alg/GNUmakefile --- gdal16/alg/GNUmakefile 2009-05-07 16:25:29.000000000 -0500 +++ gdal16-090507/alg/GNUmakefile 2009-05-07 17:17:09.000000000 -0500 @@ -18,7 +18,7 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: $(RM) *.o @@ -29,5 +29,5 @@ install: for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done -lib: $(OBJ) +lib: $(OBJ:.o=.$(OBJ_EXT)) (cd .. ; $(MAKE) force-lib) diff -ur gdal16/apps/GNUmakefile gdal16-090507/apps/GNUmakefile --- gdal16/apps/GNUmakefile 2009-05-07 16:24:52.000000000 -0500 +++ gdal16-090507/apps/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -34,106 +34,86 @@ (cd ../gcore ; $(MAKE) ) (cd ../port ; $(MAKE) ) -gdalinfo$(EXE): gdalinfo.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) gdalinfo.o $(XTRAOBJ) \ - $(CONFIG_LIBS) -o gdalinfo$(EXE) +gdalinfo$(EXE): gdalinfo.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ -gdal_translate$(EXE): gdal_translate.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) gdal_translate.o $(XTRAOBJ) \ - $(CONFIG_LIBS) -o gdal_translate$(EXE) +gdal_translate$(EXE): gdal_translate.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ -gdaladdo$(EXE): gdaladdo.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) gdaladdo.o $(XTRAOBJ) \ - $(CONFIG_LIBS) -o gdaladdo$(EXE) +gdaladdo$(EXE): gdaladdo.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ -gdalwarp$(EXE): gdalwarp.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) gdalwarp.o $(XTRAOBJ) \ - $(CONFIG_LIBS) -o gdalwarp$(EXE) +gdalwarp$(EXE): gdalwarp.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ -gdal_contour$(EXE): gdal_contour.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) gdal_contour.o $(CONFIG_LIBS) -o gdal_contour$(EXE) +gdal_contour$(EXE): gdal_contour.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ -nearblack$(EXE): nearblack.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) nearblack.o $(CONFIG_LIBS) -o nearblack$(EXE) +nearblack$(EXE): nearblack.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ -gdalmanage$(EXE): gdalmanage.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) gdalmanage.o $(CONFIG_LIBS) -o gdalmanage$(EXE) +gdalmanage$(EXE): gdalmanage.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ -gdal_rasterize$(EXE): gdal_rasterize.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) gdal_rasterize.o $(CONFIG_LIBS) -o gdal_rasterize$(EXE) +gdal_rasterize$(EXE): gdal_rasterize.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ -gdaltindex$(EXE): gdaltindex.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) gdaltindex.o $(XTRAOBJ) $(CONFIG_LIBS) \ - -o gdaltindex$(EXE) +gdaltindex$(EXE): gdaltindex.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ # Not compiled by default -gdalbuildvrt$(EXE): gdalbuildvrt.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) gdalbuildvrt.o $(XTRAOBJ) $(CONFIG_LIBS) \ - -o gdalbuildvrt$(EXE) +gdalbuildvrt$(EXE): gdalbuildvrt.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ # Not compiled by default -multireadtest$(EXE): multireadtest.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) multireadtest.o $(XTRAOBJ) $(CONFIG_LIBS) \ - -o multireadtest$(EXE) +multireadtest$(EXE): multireadtest.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ # Not compiled by default -dumpoverviews$(EXE): dumpoverviews.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) dumpoverviews.o $(XTRAOBJ) $(CONFIG_LIBS) \ - -o dumpoverviews$(EXE) +dumpoverviews$(EXE): dumpoverviews.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ -gdalenhance$(EXE): gdalenhance.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) gdalenhance.o $(XTRAOBJ) $(CONFIG_LIBS) \ - -o gdalenhance$(EXE) +gdalenhance$(EXE): gdalenhance.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ -gdal_grid$(EXE): gdal_grid.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) gdal_grid.o $(XTRAOBJ) $(CONFIG_LIBS) \ - -o gdal_grid$(EXE) +gdal_grid$(EXE): gdal_grid.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ # Not compiled by default -gdalwarpsimple$(EXE): gdalwarpsimple.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) gdalwarpsimple.o $(XTRAOBJ) \ - $(CONFIG_LIBS) -o gdalwarpsimple$(EXE) +gdalwarpsimple$(EXE): gdalwarpsimple.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ -gdaltransform$(EXE): gdaltransform.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) gdaltransform.o $(XTRAOBJ) \ - $(CONFIG_LIBS) -o gdaltransform$(EXE) +gdaltransform$(EXE): gdaltransform.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ # Not compiled by default -gdalflattenmask$(EXE): gdalflattenmask.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) gdalflattenmask.o $(XTRAOBJ) \ - $(CONFIG_LIBS) -o gdalflattenmask$(EXE) +gdalflattenmask$(EXE): gdalflattenmask.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ # Not compiled by default -gdaltorture$(EXE): gdaltorture.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) gdaltorture.o $(XTRAOBJ) \ - $(CONFIG_LIBS) -o gdaltorture$(EXE) +gdaltorture$(EXE): gdaltorture.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ # Not compiled by default -gdal2ogr$(EXE): gdal2ogr.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) gdal2ogr.o $(XTRAOBJ) $(CONFIG_LIBS) \ - -o gdal2ogr$(EXE) +gdal2ogr$(EXE): gdal2ogr.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ -ogrinfo$(EXE): ogrinfo.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) ogrinfo.o $(XTRAOBJ) $(CONFIG_LIBS) \ - -o ogrinfo$(EXE) +ogrinfo$(EXE): ogrinfo.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ -ogr2ogr$(EXE): ogr2ogr.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) ogr2ogr.o $(XTRAOBJ) $(CONFIG_LIBS) \ - -o ogr2ogr$(EXE) +ogr2ogr$(EXE): ogr2ogr.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ # Not compiled by default -testepsg$(EXE): testepsg.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) testepsg.o $(XTRAOBJ) $(CONFIG_LIBS) \ - -o testepsg$(EXE) +testepsg$(EXE): testepsg.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ -ogrtindex$(EXE): ogrtindex.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) ogrtindex.o $(XTRAOBJ) $(CONFIG_LIBS) \ - -o ogrtindex$(EXE) +ogrtindex$(EXE): ogrtindex.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ # Not compiled by default -test_ogrsf$(EXE): test_ogrsf.o $(DEP_LIBS) - $(LD) $(LNK_FLAGS) test_ogrsf.o $(XTRAOBJ) $(CONFIG_LIBS) \ - -o test_ogrsf$(EXE) +test_ogrsf$(EXE): test_ogrsf.$(OBJ_EXT) $(DEP_LIBS) + $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@ clean: $(RM) *.o $(BIN_LIST) core gdal-config gdal-config-inst diff -ur gdal16/frmts/GNUmakefile gdal16-090507/frmts/GNUmakefile --- gdal16/frmts/GNUmakefile 2009-05-07 16:25:26.000000000 -0500 +++ gdal16-090507/frmts/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -9,16 +9,16 @@ %-install-obj: $(MAKE) -C $* install-obj -default: $(OBJ) $(foreach d,$(GDAL_FORMATS),$(d)-install-obj) +default: $(OBJ:.o=.$(OBJ_EXT)) $(foreach d,$(GDAL_FORMATS),$(d)-install-obj) clean: $(foreach d,$(GDAL_FORMATS),$(d)-clean) rm -f *.o o/*.o o/*.a $(RM) o/*.lo -o/gdalallregister.o: gdalallregister.cpp ../GDALmake.opt +o/gdalallregister.$(OBJ_EXT): gdalallregister.cpp ../GDALmake.opt $(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) $(FRMT_FLAGS) \ -DGDAL_FORMATS="$(GDAL_FORMATS)" \ - gdalallregister.cpp -o o/gdalallregister.o + gdalallregister.cpp -o o/gdalallregister.$(OBJ_EXT) # We might want to add dynamically generated drivers here eventually. install: diff -ur gdal16/frmts/aaigrid/GNUmakefile gdal16-090507/frmts/aaigrid/GNUmakefile --- gdal16/frmts/aaigrid/GNUmakefile 2009-05-07 16:25:26.000000000 -0500 +++ gdal16-090507/frmts/aaigrid/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,11 +5,11 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) $(XTRA_OPT) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o -all: $(OBJ) +all: $(OBJ:.o=.$(OBJ_EXT)) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/adrg/GNUmakefile gdal16-090507/frmts/adrg/GNUmakefile --- gdal16/frmts/adrg/GNUmakefile 2009-05-07 16:25:19.000000000 -0500 +++ gdal16-090507/frmts/adrg/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -6,9 +6,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -I../iso8211 -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/aigrid/GNUmakefile gdal16-090507/frmts/aigrid/GNUmakefile --- gdal16/frmts/aigrid/GNUmakefile 2009-05-07 16:25:21.000000000 -0500 +++ gdal16-090507/frmts/aigrid/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -6,18 +6,18 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -I../../ogr/ogrsf_frmts/avc -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o aitest$(EXE) $(OBJ) $(O_OBJ) -aitest$(EXE): aitest.o - $(LD) $(LDFLAGS) aitest.o $(CONFIG_LIBS) -o aitest$(EXE) +aitest$(EXE): aitest.$(OBJ_EXT) + $(LD) $(LDFLAGS) aitest.$(OBJ_EXT) $(CONFIG_LIBS) -o aitest$(EXE) -aigrid2tif$(EXE): aigrid2tif.o - $(LD) $(LDFLAGS) aigrid2tif.o $(CONFIG_LIBS) -o aigrid2tif$(EXE) +aigrid2tif$(EXE): aigrid2tif.$(OBJ_EXT) + $(LD) $(LDFLAGS) aigrid2tif.$(OBJ_EXT) $(CONFIG_LIBS) -o aigrid2tif$(EXE) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) aitest-dist: rm -rf aitest_dist diff -ur gdal16/frmts/airsar/GNUmakefile gdal16-090507/frmts/airsar/GNUmakefile --- gdal16/frmts/airsar/GNUmakefile 2009-05-07 16:25:21.000000000 -0500 +++ gdal16-090507/frmts/airsar/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/blx/GNUmakefile gdal16-090507/frmts/blx/GNUmakefile --- gdal16/frmts/blx/GNUmakefile 2009-05-07 16:25:21.000000000 -0500 +++ gdal16-090507/frmts/blx/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -7,9 +7,9 @@ CPPFLAGS := $(XTRA_OPT) $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/bmp/GNUmakefile gdal16-090507/frmts/bmp/GNUmakefile --- gdal16/frmts/bmp/GNUmakefile 2009-05-07 16:25:21.000000000 -0500 +++ gdal16-090507/frmts/bmp/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/bsb/GNUmakefile gdal16-090507/frmts/bsb/GNUmakefile --- gdal16/frmts/bsb/GNUmakefile 2009-05-07 16:25:17.000000000 -0500 +++ gdal16-090507/frmts/bsb/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -10,16 +10,16 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -bsb2raw$(EXE): bsb2raw.o - $(LD) $(LDFLAGS) bsb2raw.o $(CONFIG_LIBS) -o bsb2raw$(EXE) +bsb2raw$(EXE): bsb2raw.$(OBJ_EXT) + $(LD) $(LDFLAGS) bsb2raw.$(OBJ_EXT) $(CONFIG_LIBS) -o bsb2raw$(EXE) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) dist: rm -rf $(DISTDIR) diff -ur gdal16/frmts/ceos/GNUmakefile gdal16-090507/frmts/ceos/GNUmakefile --- gdal16/frmts/ceos/GNUmakefile 2009-05-07 16:25:24.000000000 -0500 +++ gdal16-090507/frmts/ceos/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -6,12 +6,12 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -ceostest$(EXE): ceostest.o - $(LD) $(LDFLAGS) ceostest.o $(CONFIG_LIBS) -o ceostest$(EXE) +ceostest$(EXE): ceostest.$(OBJ_EXT) + $(LD) $(LDFLAGS) ceostest.$(OBJ_EXT) $(CONFIG_LIBS) -o ceostest$(EXE) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/ceos2/GNUmakefile gdal16-090507/frmts/ceos2/GNUmakefile --- gdal16/frmts/ceos2/GNUmakefile 2009-05-07 16:25:21.000000000 -0500 +++ gdal16-090507/frmts/ceos2/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -8,11 +8,11 @@ CPPFLAGS := -I../raw $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) $(O_OBJ): ../raw/rawdataset.h clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/coasp/GNUmakefile gdal16-090507/frmts/coasp/GNUmakefile --- gdal16/frmts/coasp/GNUmakefile 2009-05-07 16:25:21.000000000 -0500 +++ gdal16-090507/frmts/coasp/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/cosar/GNUmakefile gdal16-090507/frmts/cosar/GNUmakefile --- gdal16/frmts/cosar/GNUmakefile 2009-05-07 16:25:17.000000000 -0500 +++ gdal16-090507/frmts/cosar/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/dimap/GNUmakefile gdal16-090507/frmts/dimap/GNUmakefile --- gdal16/frmts/dimap/GNUmakefile 2009-05-07 16:25:21.000000000 -0500 +++ gdal16-090507/frmts/dimap/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -4,12 +4,12 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) install: $(INSTALL_DATA) memdataset.h $(DESTDIR)$(INST_INCLUDE) diff -ur gdal16/frmts/dods/GNUmakefile gdal16-090507/frmts/dods/GNUmakefile --- gdal16/frmts/dods/GNUmakefile 2009-05-07 16:25:24.000000000 -0500 +++ gdal16-090507/frmts/dods/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -6,19 +6,19 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) $(DODS_INC) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) # By linking with dodsdataset.o explicitly, we don't have to build the # library to get changes in that code into using_dods for testing. However, # make sure you do rebuild the library (run make two directories up) once # you're done. 12/27/02 jhrg -using_dods: using_dods.o dodsdataset.o +using_dods: using_dods.$(OBJ_EXT) dodsdataset.$(OBJ_EXT) $(LD) $(LNK_FLAGS) $^ $(XTRAOBJ) $(CONFIG_LIBS) -o $@$(EXE) # There's a note in GDALmake.opt that local programs should link against # CONFIG_LIBS, but that doesn't work here, maybe because dodsdataset_test # links statically (which it needs to do to run in a debugger). 10/31/03 jhrg -dodsdataset_test: dodsdataset_test.o dodsdataset.o +dodsdataset_test: dodsdataset_test.$(OBJ_EXT) dodsdataset.$(OBJ_EXT) $(LD) $(LNK_FLAGS) -static -g3 $^ $(XTRAOBJ) $(LIBS) $(LIBGDAL) \ -lcppunit -lxml2 -o $@$(EXE) @@ -30,6 +30,6 @@ -rm -rf docs -rm -f dodsdataset_test using_dods -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) dodsdataset.o: dodsdataset.cpp dodsdataset.h diff -ur gdal16/frmts/dted/GNUmakefile gdal16-090507/frmts/dted/GNUmakefile --- gdal16/frmts/dted/GNUmakefile 2009-05-07 16:25:21.000000000 -0500 +++ gdal16-090507/frmts/dted/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -6,12 +6,12 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) -dted_test$(EXE): dted_test.o - $(LD) $(LDFLAGS) dted_test.o $(CONFIG_LIBS) -o dted_test$(EXE) +dted_test$(EXE): dted_test.$(OBJ_EXT) + $(LD) $(LDFLAGS) dted_test.$(OBJ_EXT) $(CONFIG_LIBS) -o dted_test$(EXE) diff -ur gdal16/frmts/ecw/GNUmakefile gdal16-090507/frmts/ecw/GNUmakefile --- gdal16/frmts/ecw/GNUmakefile 2009-05-07 16:25:21.000000000 -0500 +++ gdal16-090507/frmts/ecw/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -6,12 +6,12 @@ CPPFLAGS := $(GDAL_INCLUDE) -DFRMT_ecw $(CPPFLAGS) $(EXTRA_CFLAGS) PLUGIN_SO = gdal_ECW_JP2ECW.so -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) *.so -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) plugin: $(PLUGIN_SO) diff -ur gdal16/frmts/elas/GNUmakefile gdal16-090507/frmts/elas/GNUmakefile --- gdal16/frmts/elas/GNUmakefile 2009-05-07 16:25:18.000000000 -0500 +++ gdal16-090507/frmts/elas/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -6,9 +6,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/envisat/GNUmakefile gdal16-090507/frmts/envisat/GNUmakefile --- gdal16/frmts/envisat/GNUmakefile 2009-05-07 16:25:19.000000000 -0500 +++ gdal16-090507/frmts/envisat/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -7,20 +7,20 @@ CPPFLAGS := $(GDAL_INCLUDE) $(XTRA_OPT) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o -all: $(OBJ) +all: $(OBJ:.o=.$(OBJ_EXT)) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) $(O_OBJ): ../raw/rawdataset.h -envisat_dump: envisat_dump.o EnvisatFile.o - $(CC) $(CFLAGS) envisat_dump.o EnvisatFile.o $(GDAL_LIB) -ldl -lm -o envisat_dump +envisat_dump: envisat_dump.$(OBJ_EXT) EnvisatFile.$(OBJ_EXT) + $(CC) $(CFLAGS) envisat_dump.$(OBJ_EXT) EnvisatFile.$(OBJ_EXT) $(GDAL_LIB) -ldl -lm -o envisat_dump -dumpgeo: dumpgeo.o EnvisatFile.o - $(CC) $(CFLAGS) dumpgeo.o EnvisatFile.o $(GDAL_LIB) -ldl -lm -o dumpgeo +dumpgeo: dumpgeo.$(OBJ_EXT) EnvisatFile.$(OBJ_EXT) + $(CC) $(CFLAGS) dumpgeo.$(OBJ_EXT) EnvisatFile.$(OBJ_EXT) $(GDAL_LIB) -ldl -lm -o dumpgeo diff -ur gdal16/frmts/ers/GNUmakefile gdal16-090507/frmts/ers/GNUmakefile --- gdal16/frmts/ers/GNUmakefile 2009-05-07 16:25:21.000000000 -0500 +++ gdal16-090507/frmts/ers/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -6,12 +6,12 @@ CPPFLAGS := $(GDAL_INCLUDE) -I../raw $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) $(O_OBJ): ../raw/rawdataset.h diff -ur gdal16/frmts/fit/GNUmakefile gdal16-090507/frmts/fit/GNUmakefile --- gdal16/frmts/fit/GNUmakefile 2009-05-07 16:25:22.000000000 -0500 +++ gdal16-090507/frmts/fit/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,11 +5,11 @@ CPPFLAGS := $(GDAL_INCLUDE) $(XTRA_OPT) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o -all: $(OBJ) +all: $(OBJ:.o=.$(OBJ_EXT)) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/fits/GNUmakefile gdal16-090507/frmts/fits/GNUmakefile --- gdal16/frmts/fits/GNUmakefile 2009-05-07 16:25:19.000000000 -0500 +++ gdal16-090507/frmts/fits/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -7,9 +7,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(FITS_OPTS) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/georaster/GNUmakefile gdal16-090507/frmts/georaster/GNUmakefile --- gdal16/frmts/georaster/GNUmakefile 2009-05-07 16:25:25.000000000 -0500 +++ gdal16-090507/frmts/georaster/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -24,12 +24,12 @@ CPPFLAGS := $(CPPFLAGS) -I../jpeg/libjpeg endif -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) *.so -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) plugin: $(PLUGIN_SO) diff -ur gdal16/frmts/gff/GNUmakefile gdal16-090507/frmts/gff/GNUmakefile --- gdal16/frmts/gff/GNUmakefile 2009-05-07 16:25:19.000000000 -0500 +++ gdal16-090507/frmts/gff/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,10 +5,10 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/gif/GNUmakefile gdal16-090507/frmts/gif/GNUmakefile --- gdal16/frmts/gif/GNUmakefile 2009-05-07 16:25:16.000000000 -0500 +++ gdal16-090507/frmts/gif/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -12,15 +12,15 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) $(XTRA_OPT) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -../o/%.o: libungif/%.c +../o/%.$(OBJ_EXT): libungif/%.c $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ -all: $(OBJ) +all: $(OBJ:.o=.$(OBJ_EXT)) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/grass/GNUmakefile gdal16-090507/frmts/grass/GNUmakefile --- gdal16/frmts/grass/GNUmakefile 2009-05-07 16:25:12.000000000 -0500 +++ gdal16-090507/frmts/grass/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -12,13 +12,13 @@ CPPFLAGS := $(GRASS_INCLUDE) $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) $(OBJ) rm -f *~ -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) dist: cp -r pkg gdal-grass-$(GDAL_VER) diff -ur gdal16/frmts/grib/GNUmakefile gdal16-090507/frmts/grib/GNUmakefile --- gdal16/frmts/grib/GNUmakefile 2009-05-07 16:25:23.000000000 -0500 +++ gdal16-090507/frmts/grib/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -16,39 +16,39 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) $(EXTRAFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) -../o/%.o: degrib18/degrib/%.c +../o/%.$(OBJ_EXT): degrib18/degrib/%.c $(CC) -c $(CPPFLAGS) $(CFLAGS) -Idegrib18/g2clib-1.0.4 $< -o $@ -../o/%.o: degrib18/degrib/%.cpp +../o/%.$(OBJ_EXT): degrib18/degrib/%.cpp $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ -../o/%.o: degrib18/g2clib-1.0.4/%.c +../o/%.$(OBJ_EXT): degrib18/g2clib-1.0.4/%.c $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ -../o/%.o: degrib18/g2clib-1.0.4/%.cpp +../o/%.$(OBJ_EXT): degrib18/g2clib-1.0.4/%.cpp $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ -%.o: degrib18/degrib/%.c +%.$(OBJ_EXT): degrib18/degrib/%.c $(CC) -c $(CPPFLAGS) $(CFLAGS) -Idegrib18/g2clib-1.0.4 $< -o $@ -%.o: degrib18/degrib/%.cpp +%.$(OBJ_EXT): degrib18/degrib/%.cpp $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ -%.o: degrib18/g2clib-1.0.4/%.c +%.$(OBJ_EXT): degrib18/g2clib-1.0.4/%.c $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ -%.o: degrib18/g2clib-1.0.4/%.cpp +%.$(OBJ_EXT): degrib18/g2clib-1.0.4/%.cpp $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ -defaultold: $(OBJ) +defaultold: $(OBJ:.o=.$(OBJ_EXT)) (cd degrib18/degrib; $(MAKE)); cd ../.. (cd degrib18/g2clib-1.0.4; $(MAKE)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) plugin: gdal_GRIB.so diff -ur gdal16/frmts/gsg/GNUmakefile gdal16-090507/frmts/gsg/GNUmakefile --- gdal16/frmts/gsg/GNUmakefile 2009-05-07 16:25:22.000000000 -0500 +++ gdal16-090507/frmts/gsg/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/gtiff/GNUmakefile gdal16-090507/frmts/gtiff/GNUmakefile --- gdal16/frmts/gtiff/GNUmakefile 2009-05-07 16:25:16.000000000 -0500 +++ gdal16-090507/frmts/gtiff/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -18,23 +18,23 @@ CPPFLAGS := $(GDAL_INCLUDE) $(GEOTIFF_INCLUDE) $(TIFF_OPTS) $(CPPFLAGS) -default: $(OBJ) $(SUBLIBS) +default: $(OBJ:.o=.$(OBJ_EXT)) $(SUBLIBS) clean: rm -f *.o $(O_OBJ) (cd libtiff; $(MAKE) clean) (cd libgeotiff; $(MAKE) clean) -gt_test: gt_test.o gt_gs.o cpl_csv.o - $(CC) gt_test.o gt_gs.o cpl_csv.o ../../port/*.o \ +gt_test: gt_test.$(OBJ_EXT) gt_gs.$(OBJ_EXT) cpl_csv.$(OBJ_EXT) + $(CC) gt_test.$(OBJ_EXT) gt_gs.$(OBJ_EXT) cpl_csv.$(OBJ_EXT) ../../port/*.$(OBJ_EXT) \ libgeotiff/libgeotiff.a libtiff/libtiff.a $(LIBS) -o gt_test -gt_write: gt_write.o gt_gs.o cpl_csv.o - $(CC) gt_write.o gt_gs.o cpl_csv.o ../../port/*.o \ +gt_write: gt_write.$(OBJ_EXT) gt_gs.$(OBJ_EXT) cpl_csv.$(OBJ_EXT) + $(CC) gt_write.$(OBJ_EXT) gt_gs.$(OBJ_EXT) cpl_csv.$(OBJ_EXT) ../../port/*.$(OBJ_EXT) \ libgeotiff/libgeotiff.a libtiff/libtiff.a $(LIBS) -o gt_write -epsg_to_wkt: epsg_to_wkt.o gt_wkt_srs.o - $(CXX) epsg_to_wkt.o gt_wkt_srs.o ../../port/*.o \ +epsg_to_wkt: epsg_to_wkt.$(OBJ_EXT) gt_wkt_srs.$(OBJ_EXT) + $(CXX) epsg_to_wkt.$(OBJ_EXT) gt_wkt_srs.$(OBJ_EXT) ../../port/*.$(OBJ_EXT) \ libgeotiff/libgeotiff.a libtiff/libtiff.a \ $(GDAL_LIB) $(LIBS) -o epsg_to_wkt @@ -44,4 +44,4 @@ lib-geotiff: (cd libgeotiff; $(MAKE) install-obj) -install-obj: $(SUBLIBS) $(O_OBJ) +install-obj: $(SUBLIBS) $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/gtiff/libgeotiff/GNUmakefile gdal16-090507/frmts/gtiff/libgeotiff/GNUmakefile --- gdal16/frmts/gtiff/libgeotiff/GNUmakefile 2009-05-07 16:25:16.000000000 -0500 +++ gdal16-090507/frmts/gtiff/libgeotiff/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -25,14 +25,14 @@ endif -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f $(O_OBJ) *.o *.a -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) -../../o/%.o: %.c +../../o/%.$(OBJ_EXT): %.c $(CC) -c -I../../port $(ALL_C_FLAGS) $< -o $@ # diff -ur gdal16/frmts/gtiff/libtiff/GNUmakefile gdal16-090507/frmts/gtiff/libtiff/GNUmakefile --- gdal16/frmts/gtiff/libtiff/GNUmakefile 2009-05-07 16:25:15.000000000 -0500 +++ gdal16-090507/frmts/gtiff/libtiff/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -61,7 +61,7 @@ ALL_C_FLAGS := $(ALL_C_FLAGS) -I../../jpeg/libjpeg endif -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f $(O_OBJ) *.o *.a @@ -83,7 +83,7 @@ @echo '% cvs commit -m "updated to libtiff 3.6.0"' @echo -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) -../../o/%.o: %.c +../../o/%.$(OBJ_EXT): %.c $(CC) -c -I../../port $(ALL_C_FLAGS) $< -o $@ diff -ur gdal16/frmts/gxf/GNUmakefile gdal16-090507/frmts/gxf/GNUmakefile --- gdal16/frmts/gxf/GNUmakefile 2009-05-07 16:25:13.000000000 -0500 +++ gdal16-090507/frmts/gxf/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -11,15 +11,15 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o -gxftest$(EXE): gxftest.o - $(LD) $(LDFLAGS) gxftest.o $(GXFOBJ) ../../port/*.o $(LIBS) -o gxftest$(EXE) +gxftest$(EXE): gxftest.$(OBJ_EXT) + $(LD) $(LDFLAGS) gxftest.$(OBJ_EXT) $(GXFOBJ) ../../port/*.$(OBJ_EXT) $(LIBS) -o gxftest$(EXE) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) $(SHARED_LIB): $(OBJ) $(LD_SHARED) $(OBJ) $(GDAL_SLIB_LINK) $(LIBS) -o $(SHARED_LIB) diff -ur gdal16/frmts/hdf4/GNUmakefile gdal16-090507/frmts/hdf4/GNUmakefile --- gdal16/frmts/hdf4/GNUmakefile 2009-05-07 16:25:18.000000000 -0500 +++ gdal16-090507/frmts/hdf4/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -14,7 +14,7 @@ CPPFLAGS := $(GDAL_INCLUDE) $(HDF4_INCLUDE) $(HDFEOS_OPTS) $(CPPFLAGS) -default: $(OBJ) $(SUBLIBS) +default: $(OBJ:.o=.$(OBJ_EXT)) $(SUBLIBS) clean: rm -f *.o $(O_OBJ) @@ -23,4 +23,4 @@ lib-hdfeos: (cd hdf-eos; $(MAKE) install-obj) -install-obj: $(SUBLIBS) $(O_OBJ) +install-obj: $(SUBLIBS) $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/hdf4/hdf-eos/GNUmakefile gdal16-090507/frmts/hdf4/hdf-eos/GNUmakefile --- gdal16/frmts/hdf4/hdf-eos/GNUmakefile 2009-05-07 16:25:18.000000000 -0500 +++ gdal16-090507/frmts/hdf4/hdf-eos/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -11,12 +11,12 @@ CPPFLAGS := $(GDAL_INCLUDE) $(HDF4_INCLUDE) -I. -I.. $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: $(RM) *.o *.a $(O_OBJ) -install-obj: $(SUBLIBS) $(O_OBJ) +install-obj: $(SUBLIBS) $(O_OBJ:.o=.$(OBJ_EXT)) -../../o/%.o: %.c +../../o/%.$(OBJ_EXT): %.c $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< diff -ur gdal16/frmts/hdf5/GNUmakefile gdal16-090507/frmts/hdf5/GNUmakefile --- gdal16/frmts/hdf5/GNUmakefile 2009-05-07 16:25:18.000000000 -0500 +++ gdal16-090507/frmts/hdf5/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -8,9 +8,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(HDF5_INCLUDE) $(CPPFLAGS) -default: $(OBJ) $(SUBLIBS) +default: $(OBJ:.o=.$(OBJ_EXT)) $(SUBLIBS) clean: rm -f *.o $(O_OBJ) -install-obj: $(SUBLIBS) $(O_OBJ) +install-obj: $(SUBLIBS) $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/hfa/GNUmakefile gdal16-090507/frmts/hfa/GNUmakefile --- gdal16/frmts/hfa/GNUmakefile 2009-05-07 16:25:25.000000000 -0500 +++ gdal16-090507/frmts/hfa/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -12,29 +12,29 @@ IMG_DATA_DIR = /usr2/data/imagine -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o hfatest img2tif $(O_OBJ) $(O_OBJ): hfa.h hfa_p.h -%.o: addtiffo_src/%.cpp +%.$(OBJ_EXT): addtiffo_src/%.cpp $(CXX) -c -I../../gcore -I../../port $(ALL_C_FLAGS) \ - addtiffo_src/$*.cpp -o $*.o + addtiffo_src/$*.cpp -o $*.$(OBJ_EXT) -hfatest: hfatest.o $(HFAOBJ) - $(LD) hfatest.o $(HFAOBJ) ../../port/*.o $(LIBS) -o hfatest +hfatest: hfatest.$(OBJ_EXT) $(HFAOBJ:.o=.$(OBJ_EXT)) + $(LD) hfatest.$(OBJ_EXT) $(HFAOBJ:.o=.$(OBJ_EXT)) ../../port/*.$(OBJ_EXT) $(LIBS) -o hfatest img2tif: img2tif.cpp imggeotiff.c geoextra.c \ - tif_overview.o rawblockedimage.o $(HFAOBJ) + tif_overview.$(OBJ_EXT) rawblockedimage.$(OBJ_EXT) $(HFAOBJ:.o=.$(OBJ_EXT)) $(LD) $(ALL_C_FLAGS) -I../gtiff/libtiff -I../gtiff/libgeotiff \ img2tif.cpp imggeotiff.c geoextra.c \ - $(HFAOBJ) ../../port/*.o $(LIBS) \ - tif_overview.o rawblockedimage.o\ - ../gtiff/libgeotiff/*.o \ - ../gtiff/libtiff/*.o \ + $(HFAOBJ:.o=.$(OBJ_EXT)) ../../port/*.$(OBJ_EXT) $(LIBS) \ + tif_overview.$(OBJ_EXT) rawblockedimage.$(OBJ_EXT)\ + ../gtiff/libgeotiff/*.$(OBJ_EXT) \ + ../gtiff/libtiff/*.$(OBJ_EXT) \ -o img2tif # @@ -51,7 +51,7 @@ ./tst_img2tif_1.sh -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) img2tif-dist: rm -rf img2tif_dist diff -ur gdal16/frmts/idrisi/GNUmakefile gdal16-090507/frmts/idrisi/GNUmakefile --- gdal16/frmts/idrisi/GNUmakefile 2009-05-07 16:25:12.000000000 -0500 +++ gdal16-090507/frmts/idrisi/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -6,10 +6,10 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/ilwis/GNUmakefile gdal16-090507/frmts/ilwis/GNUmakefile --- gdal16/frmts/ilwis/GNUmakefile 2009-05-07 16:25:14.000000000 -0500 +++ gdal16-090507/frmts/ilwis/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS = $(GDAL_INCLUDE) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/ingr/GNUmakefile gdal16-090507/frmts/ingr/GNUmakefile --- gdal16/frmts/ingr/GNUmakefile 2009-05-07 16:25:26.000000000 -0500 +++ gdal16-090507/frmts/ingr/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -6,12 +6,12 @@ CPPFLAGS := -I../gtiff/libtiff $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) $(OBJ) $(O_OBJ): IngrTypes.h IntergraphBand.h IntergraphDataset.h JpegHelper.h clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/iso8211/GNUmakefile gdal16-090507/frmts/iso8211/GNUmakefile --- gdal16/frmts/iso8211/GNUmakefile 2009-05-07 16:25:21.000000000 -0500 +++ gdal16-090507/frmts/iso8211/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -22,24 +22,24 @@ dist-clean: clean rm -rf $(DISTDIR) -$(ISOLIB): $(OBJ) +$(ISOLIB): $(OBJ:.o=.$(OBJ_EXT)) $(AR) r $(ISOLIB) $? $(RANLIB) $(ISOLIB) -8211dump$(EXE): 8211dump.o - $(LD) $(LDFLAGS) 8211dump.o $(CONFIG_LIBS) -o 8211dump$(EXE) +8211dump$(EXE): 8211dump.$(OBJ_EXT) + $(LD) $(LDFLAGS) 8211dump.$(OBJ_EXT) $(CONFIG_LIBS) -o 8211dump$(EXE) -8211view$(EXE): 8211view.o - $(LD) $(LDFLAGS) 8211view.o $(CONFIG_LIBS) -o 8211view$(EXE) +8211view$(EXE): 8211view.$(OBJ_EXT) + $(LD) $(LDFLAGS) 8211view.$(OBJ_EXT) $(CONFIG_LIBS) -o 8211view$(EXE) -timetest$(EXE): timetest.o - $(LD) $(LDFLAGS) timetest.o $(CONFIG_LIBS) -o timetest$(EXE) +timetest$(EXE): timetest.$(OBJ_EXT) + $(LD) $(LDFLAGS) timetest.$(OBJ_EXT) $(CONFIG_LIBS) -o timetest$(EXE) -upd_test$(EXE): upd_test.o - $(LD) $(LDFLAGS) upd_test.o $(CONFIG_LIBS) -o upd_test$(EXE) +upd_test$(EXE): upd_test.$(OBJ_EXT) + $(LD) $(LDFLAGS) upd_test.$(OBJ_EXT) $(CONFIG_LIBS) -o upd_test$(EXE) -mkcatalog$(EXE): mkcatalog.o - $(LD) $(LDFLAGS) mkcatalog.o $(CONFIG_LIBS) -o mkcatalog$(EXE) +mkcatalog$(EXE): mkcatalog.$(OBJ_EXT) + $(LD) $(LDFLAGS) mkcatalog.$(OBJ_EXT) $(CONFIG_LIBS) -o mkcatalog$(EXE) docs: rm -rf html @@ -82,4 +82,4 @@ diff t1.out teststream.out; \ fi -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/jaxapalsar/GNUmakefile gdal16-090507/frmts/jaxapalsar/GNUmakefile --- gdal16/frmts/jaxapalsar/GNUmakefile 2009-05-07 16:25:14.000000000 -0500 +++ gdal16-090507/frmts/jaxapalsar/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -3,8 +3,8 @@ OBJ = jaxapalsardataset.o CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/jdem/GNUmakefile gdal16-090507/frmts/jdem/GNUmakefile --- gdal16/frmts/jdem/GNUmakefile 2009-05-07 16:25:12.000000000 -0500 +++ gdal16-090507/frmts/jdem/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/jp2kak/GNUmakefile gdal16-090507/frmts/jp2kak/GNUmakefile --- gdal16/frmts/jp2kak/GNUmakefile 2009-05-07 16:25:17.000000000 -0500 +++ gdal16-090507/frmts/jp2kak/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -21,13 +21,13 @@ CPPFLAGS := $(GDAL_INCLUDE) $(KAKINC) -I. $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) rm -f $(INSTOBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) cp $(APPOBJ) ../o $(OBJ) $(O_OBJ): subfile_source.h diff -ur gdal16/frmts/jpeg/GNUmakefile gdal16-090507/frmts/jpeg/GNUmakefile --- gdal16/frmts/jpeg/GNUmakefile 2009-05-07 16:25:14.000000000 -0500 +++ gdal16-090507/frmts/jpeg/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -25,14 +25,14 @@ CPPFLAGS := $(XTRA_OPT) $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -../o/%.o: libjpeg/%.c +../o/%.$(OBJ_EXT): libjpeg/%.c $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ -all: $(OBJ) +all: $(OBJ:.o=.$(OBJ_EXT)) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/jpeg2000/GNUmakefile gdal16-090507/frmts/jpeg2000/GNUmakefile --- gdal16/frmts/jpeg2000/GNUmakefile 2009-05-07 16:25:14.000000000 -0500 +++ gdal16-090507/frmts/jpeg2000/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(JASPER_FLAGS) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f $(OBJ) $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/l1b/GNUmakefile gdal16-090507/frmts/l1b/GNUmakefile --- gdal16/frmts/l1b/GNUmakefile 2009-05-07 16:25:17.000000000 -0500 +++ gdal16-090507/frmts/l1b/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/leveller/GNUmakefile gdal16-090507/frmts/leveller/GNUmakefile --- gdal16/frmts/leveller/GNUmakefile 2009-05-07 16:25:26.000000000 -0500 +++ gdal16-090507/frmts/leveller/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/mem/GNUmakefile gdal16-090507/frmts/mem/GNUmakefile --- gdal16/frmts/mem/GNUmakefile 2009-05-07 16:25:17.000000000 -0500 +++ gdal16-090507/frmts/mem/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -6,12 +6,12 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) install: $(INSTALL_DATA) memdataset.h $(DESTDIR)$(INST_INCLUDE) diff -ur gdal16/frmts/mrsid/GNUmakefile gdal16-090507/frmts/mrsid/GNUmakefile --- gdal16/frmts/mrsid/GNUmakefile 2009-05-07 16:25:20.000000000 -0500 +++ gdal16-090507/frmts/mrsid/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -9,9 +9,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(MRSID_FLAGS) $(MRSID_INCLUDE) $(GEOTIFF_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/msg/GNUmakefile gdal16-090507/frmts/msg/GNUmakefile --- gdal16/frmts/msg/GNUmakefile 2009-05-07 16:25:23.000000000 -0500 +++ gdal16-090507/frmts/msg/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -12,9 +12,9 @@ CPPFLAGS = $(GDAL_INCLUDE) -I PublicDecompWT/DISE -I PublicDecompWT/COMP/WT/Inc -I PublicDecompWT/COMP/Inc -I. -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/msgn/GNUmakefile gdal16-090507/frmts/msgn/GNUmakefile --- gdal16/frmts/msgn/GNUmakefile 2009-05-07 16:25:19.000000000 -0500 +++ gdal16-090507/frmts/msgn/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -I. -DGDAL_SUPPORT -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/netcdf/GNUmakefile gdal16-090507/frmts/netcdf/GNUmakefile --- gdal16/frmts/netcdf/GNUmakefile 2009-05-07 16:25:26.000000000 -0500 +++ gdal16-090507/frmts/netcdf/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) $(XTRA_OPT) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/nitf/GNUmakefile gdal16-090507/frmts/nitf/GNUmakefile --- gdal16/frmts/nitf/GNUmakefile 2009-05-07 16:25:19.000000000 -0500 +++ gdal16-090507/frmts/nitf/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -18,14 +18,14 @@ CPPFLAGS := $(CPPFLAGS) -I../jpeg/libjpeg endif -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) $(OBJ) $(O_OBJ): ../../gcore/gdal_proxy.h nitflib.h clean: rm -f *.o $(O_OBJ) nitfdump$(EXE) -nitfdump$(EXE): nitfdump.o - $(LD) $(LDFLAGS) nitfdump.o $(CONFIG_LIBS) -o nitfdump$(EXE) +nitfdump$(EXE): nitfdump.$(OBJ_EXT) + $(LD) $(LDFLAGS) nitfdump.$(OBJ_EXT) $(CONFIG_LIBS) -o nitfdump$(EXE) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/ogdi/GNUmakefile gdal16-090507/frmts/ogdi/GNUmakefile --- gdal16/frmts/ogdi/GNUmakefile 2009-05-07 16:25:12.000000000 -0500 +++ gdal16-090507/frmts/ogdi/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/pcidsk/GNUmakefile gdal16-090507/frmts/pcidsk/GNUmakefile --- gdal16/frmts/pcidsk/GNUmakefile 2009-05-07 16:25:19.000000000 -0500 +++ gdal16-090507/frmts/pcidsk/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,11 +5,11 @@ CPPFLAGS := $(GDAL_INCLUDE) -I../raw $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) $(O_OBJ): ../raw/rawdataset.h clean: rm -f *.o -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/pcraster/GNUmakefile gdal16-090507/frmts/pcraster/GNUmakefile --- gdal16/frmts/pcraster/GNUmakefile 2009-05-07 16:25:18.000000000 -0500 +++ gdal16-090507/frmts/pcraster/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -10,16 +10,16 @@ OBJ += pcrasterdataset.o pcrastermisc.o pcrasterrasterband.o pcrasterutil.o -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o libcsf/*.o $(O_OBJ) rm -fR html -../o/%.o: libcsf/%.c +../o/%.$(OBJ_EXT): libcsf/%.c $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) docs: doxygen doxygen.cfg diff -ur gdal16/frmts/pds/GNUmakefile gdal16-090507/frmts/pds/GNUmakefile --- gdal16/frmts/pds/GNUmakefile 2009-05-07 16:25:21.000000000 -0500 +++ gdal16-090507/frmts/pds/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,12 +5,12 @@ CPPFLAGS := -I../raw $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) $(O_OBJ): nasakeywordhandler.h ../raw/rawdataset.h clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/pgchip/GNUmakefile gdal16-090507/frmts/pgchip/GNUmakefile --- gdal16/frmts/pgchip/GNUmakefile 2009-05-07 16:25:19.000000000 -0500 +++ gdal16-090507/frmts/pgchip/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -11,14 +11,14 @@ CPPFLAGS := -Wall -g $(XTRA_OPT) $(PG_INC) $(POSTGIS_INC) $(GDAL_INCLUDE) $(CPPFLAGS ) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -../o/%.o: +../o/%.$(OBJ_EXT): $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ -all: $(OBJ) +all: $(OBJ:.o=.$(OBJ_EXT)) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/png/GNUmakefile gdal16-090507/frmts/png/GNUmakefile --- gdal16/frmts/png/GNUmakefile 2009-05-07 16:25:13.000000000 -0500 +++ gdal16-090507/frmts/png/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -37,14 +37,14 @@ CPPFLAGS := $(XTRA_OPT) $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o libpng/*.o $(O_OBJ) -../o/%.o: libpng/%.c +../o/%.$(OBJ_EXT): libpng/%.c $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ -all: $(OBJ) +all: $(OBJ:.o=.$(OBJ_EXT)) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/raw/GNUmakefile gdal16-090507/frmts/raw/GNUmakefile --- gdal16/frmts/raw/GNUmakefile 2009-05-07 16:25:24.000000000 -0500 +++ gdal16-090507/frmts/raw/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -11,12 +11,12 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) $(OBJ) $(O_OBJ): rawdataset.h diff -ur gdal16/frmts/rik/GNUmakefile gdal16-090507/frmts/rik/GNUmakefile --- gdal16/frmts/rik/GNUmakefile 2009-05-07 16:25:23.000000000 -0500 +++ gdal16-090507/frmts/rik/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -11,9 +11,9 @@ CPPFLAGS := $(XTRA_OPT) $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/rmf/GNUmakefile gdal16-090507/frmts/rmf/GNUmakefile --- gdal16/frmts/rmf/GNUmakefile 2009-05-07 16:25:23.000000000 -0500 +++ gdal16-090507/frmts/rmf/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/rs2/GNUmakefile gdal16-090507/frmts/rs2/GNUmakefile --- gdal16/frmts/rs2/GNUmakefile 2009-05-07 16:25:26.000000000 -0500 +++ gdal16-090507/frmts/rs2/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/sdts/GNUmakefile gdal16-090507/frmts/sdts/GNUmakefile --- gdal16/frmts/sdts/GNUmakefile 2009-05-07 16:25:21.000000000 -0500 +++ gdal16-090507/frmts/sdts/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -19,7 +19,7 @@ -default: $(SDTSLIB) sdtsdataset.o +default: $(SDTSLIB) sdtsdataset.$(OBJ_EXT) all: $(SDTSLIB) sdts2shp @@ -29,15 +29,15 @@ clean-dist: rm -rf $(DISTDIR) $(DISTDIR).zip $(DISTDIR).tar.gz -$(SDTSLIB): $(OBJ) +$(SDTSLIB): $(OBJ:.o=.$(OBJ_EXT)) ar r $(SDTSLIB) $? sdts2shp: sdts2shp.cpp $(SDTSLIB) $(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(SHPDIR) sdts2shp.cpp \ - $(SHPDIR)/shpopen.o $(SHPDIR)/dbfopen.o \ + $(SHPDIR)/shpopen.$(OBJ_EXT) $(SHPDIR)/dbfopen.$(OBJ_EXT) \ $(LIBS) -o sdts2shp -install-obj: $(O_OBJ) ../o/sdtsdataset.o +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) ../o/sdtsdataset.$(OBJ_EXT) docs: rm -rf html diff -ur gdal16/frmts/sgi/GNUmakefile gdal16-090507/frmts/sgi/GNUmakefile --- gdal16/frmts/sgi/GNUmakefile 2009-05-07 16:25:22.000000000 -0500 +++ gdal16-090507/frmts/sgi/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,14 +5,14 @@ CPPFLAGS := $(XTRA_OPT) $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -../o/%.o: +../o/%.$(OBJ_EXT): $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ -all: $(OBJ) +all: $(OBJ:.o=.$(OBJ_EXT)) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/srtmhgt/GNUmakefile gdal16-090507/frmts/srtmhgt/GNUmakefile --- gdal16/frmts/srtmhgt/GNUmakefile 2009-05-07 16:25:21.000000000 -0500 +++ gdal16-090507/frmts/srtmhgt/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,14 +5,14 @@ CPPFLAGS := $(XTRA_OPT) $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -../o/%.o: +../o/%.$(OBJ_EXT): $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ -all: $(OBJ) +all: $(OBJ:.o=.$(OBJ_EXT)) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/terragen/GNUmakefile gdal16-090507/frmts/terragen/GNUmakefile --- gdal16/frmts/terragen/GNUmakefile 2009-05-07 16:25:17.000000000 -0500 +++ gdal16-090507/frmts/terragen/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/terralib/GNUmakefile gdal16-090507/frmts/terralib/GNUmakefile --- gdal16/frmts/terralib/GNUmakefile 2009-05-07 16:25:21.000000000 -0500 +++ gdal16-090507/frmts/terralib/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -19,12 +19,12 @@ EXTRA_LIBS := $(EXTRA_LIBS) $(TERRALIB_LIB) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) plugin: gdal_TERRALIB.so diff -ur gdal16/frmts/tsx/GNUmakefile gdal16-090507/frmts/tsx/GNUmakefile --- gdal16/frmts/tsx/GNUmakefile 2009-05-07 16:25:20.000000000 -0500 +++ gdal16-090507/frmts/tsx/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -3,8 +3,8 @@ OBJ = tsxdataset.o CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/usgsdem/GNUmakefile gdal16-090507/frmts/usgsdem/GNUmakefile --- gdal16/frmts/usgsdem/GNUmakefile 2009-05-07 16:25:21.000000000 -0500 +++ gdal16-090507/frmts/usgsdem/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS := $(GDAL_INCLUDE) -I../../alg $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/vrt/GNUmakefile gdal16-090507/frmts/vrt/GNUmakefile --- gdal16/frmts/vrt/GNUmakefile 2009-05-07 16:25:17.000000000 -0500 +++ gdal16-090507/frmts/vrt/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -8,12 +8,12 @@ CPPFLAGS := -I../raw $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) $(OBJ) $(O_OBJ): vrtdataset.h ../raw/rawdataset.h ../../gcore/gdal_proxy.h diff -ur gdal16/frmts/wcs/GNUmakefile gdal16-090507/frmts/wcs/GNUmakefile --- gdal16/frmts/wcs/GNUmakefile 2009-05-07 16:25:25.000000000 -0500 +++ gdal16-090507/frmts/wcs/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -5,9 +5,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(OBJ) $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/wms/GNUmakefile gdal16-090507/frmts/wms/GNUmakefile --- gdal16/frmts/wms/GNUmakefile 2009-05-07 16:25:19.000000000 -0500 +++ gdal16-090507/frmts/wms/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -7,11 +7,11 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) $(CURL_INC) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(OBJ) $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) $(OBJ) $(O_OBJ): gdalhttp.h md5.h minidriver_tileservice.h minidriver_wms.h minidriver_worldwind.h wmsdriver.h \ No newline at end of file diff -ur gdal16/frmts/xpm/GNUmakefile gdal16-090507/frmts/xpm/GNUmakefile --- gdal16/frmts/xpm/GNUmakefile 2009-05-07 16:25:21.000000000 -0500 +++ gdal16-090507/frmts/xpm/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -7,9 +7,9 @@ CPPFLAGS := $(GDAL_INCLUDE) $(XTRAOPTS) $(CPPFLAGS) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/frmts/zlib/GNUmakefile gdal16-090507/frmts/zlib/GNUmakefile --- gdal16/frmts/zlib/GNUmakefile 2009-05-07 16:25:16.000000000 -0500 +++ gdal16-090507/frmts/zlib/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -18,9 +18,9 @@ uncompr.o \ zutil.o -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o -install-obj: $(O_OBJ) +install-obj: $(O_OBJ:.o=.$(OBJ_EXT)) diff -ur gdal16/gcore/GNUmakefile gdal16-090507/gcore/GNUmakefile --- gdal16/gcore/GNUmakefile 2009-05-07 16:25:28.000000000 -0500 +++ gdal16-090507/gcore/GNUmakefile 2009-05-07 17:12:46.000000000 -0500 @@ -18,7 +18,7 @@ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) $(PAM_SETTING) -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: $(RM) *.o @@ -26,11 +26,11 @@ docs: (cd ..; $(MAKE) docs) -gdal_misc.o: gdal_misc.cpp gdal_version.h +gdal_misc.$(OBJ_EXT): gdal_misc.cpp gdal_version.h -gdaldrivermanager.o: gdaldrivermanager.cpp ../GDALmake.opt +gdaldrivermanager.$(OBJ_EXT): gdaldrivermanager.cpp ../GDALmake.opt $(CXX) -c $(GDAL_INCLUDE) $(CXXFLAGS) -DINST_DATA=\"$(INST_DATA)\" \ - $*.cpp -o $*.o + $< -o $@ install: for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done diff -ur gdal16/ogr/GNUmakefile gdal16-090507/ogr/GNUmakefile --- gdal16/ogr/GNUmakefile 2009-05-07 16:25:11.000000000 -0500 +++ gdal16-090507/ogr/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -29,7 +29,7 @@ very-clean: clean rm -rf html rtf -lib: sublibs $(OBJ) +lib: sublibs $(OBJ:.o=.$(OBJ_EXT)) $(OBJ): ogr_feature.h ogr_geometry.h diff -ur gdal16/ogr/ogrsf_frmts/avc/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/avc/GNUmakefile --- gdal16/ogr/ogrsf_frmts/avc/GNUmakefile 2009-05-07 16:25:09.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/avc/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -15,7 +15,7 @@ CPPFLAGS := -I../shape -I.. -I../.. $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/bna/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/bna/GNUmakefile --- gdal16/ogr/ogrsf_frmts/bna/GNUmakefile 2009-05-07 16:25:08.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/bna/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -10,7 +10,7 @@ CPPFLAGS := -I.. -I../.. $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/csv/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/csv/GNUmakefile --- gdal16/ogr/ogrsf_frmts/csv/GNUmakefile 2009-05-07 16:25:08.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/csv/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -6,7 +6,7 @@ CPPFLAGS := -I.. -I../.. $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/dgn/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/dgn/GNUmakefile --- gdal16/ogr/ogrsf_frmts/dgn/GNUmakefile 2009-05-07 16:25:02.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/dgn/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -29,17 +29,17 @@ $(CPL_DIR)/cpl_path.cpp $(CPL_DIR)/cpl_dir.cpp \ $(CPL_DIR)/cpl_multiproc.h $(CPL_DIR)/cpl_multiproc.cpp -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -rf *.o $(DEST_DIR) dgnlib-$(DIST_REV).zip html man $(O_OBJ) rm -f dgndump$(EXE) dgnwritetest$(EXE) -dgndump$(EXE): dgndump.o - $(LD) $(LDFLAGS) dgndump.o $(CONFIG_LIBS) -o dgndump$(EXE) +dgndump$(EXE): dgndump.$(OBJ_EXT) + $(LD) $(LDFLAGS) dgndump.$(OBJ_EXT) $(CONFIG_LIBS) -o dgndump$(EXE) -dgnwritetest$(EXE): dgnwritetest.o - $(LD) $(LDFLAGS) dgnwritetest.o $(CONFIG_LIBS) -o dgnwritetest$(EXE) +dgnwritetest$(EXE): dgnwritetest.$(OBJ_EXT) + $(LD) $(LDFLAGS) dgnwritetest.$(OBJ_EXT) $(CONFIG_LIBS) -o dgnwritetest$(EXE) docs: doxygen diff -ur gdal16/ogr/ogrsf_frmts/dods/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/dods/GNUmakefile --- gdal16/ogr/ogrsf_frmts/dods/GNUmakefile 2009-05-07 16:25:08.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/dods/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -7,7 +7,7 @@ CPPFLAGS := -I.. $(GDAL_INCLUDE) $(CPPFLAGS) $(DODS_INC) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/fme/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/fme/GNUmakefile --- gdal16/ogr/ogrsf_frmts/fme/GNUmakefile 2009-05-07 16:25:01.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/fme/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -9,7 +9,7 @@ CPPFLAGS += -I.. -I../.. $(FME_INCLUDE) \ -DSUPPORT_INDIRECT_FMEDLL -DSUPPORT_PERSISTENT_CACHE -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/generic/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/generic/GNUmakefile --- gdal16/ogr/ogrsf_frmts/generic/GNUmakefile 2009-05-07 16:25:09.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/generic/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -111,9 +111,14 @@ CXXFLAGS := $(CXXFLAGS) -DIDB_ENABLED endif +ifeq ($(HAVE_PANORAMA),yes) +CFLAGS := $(CFLAGS) -DPANORAMA_ENABLED +CXXFLAGS := $(CXXFLAGS) -DPANORAMA_ENABLED +endif + CPPFLAGS := -I.. -I../.. $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/geoconcept/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/geoconcept/GNUmakefile --- gdal16/ogr/ogrsf_frmts/geoconcept/GNUmakefile 2009-05-07 16:25:07.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/geoconcept/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -5,7 +5,7 @@ CPPFLAGS := -DUSE_CPL -I.. -I../.. $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/geojson/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/geojson/GNUmakefile --- gdal16/ogr/ogrsf_frmts/geojson/GNUmakefile 2009-05-07 16:25:08.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/geojson/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -16,7 +16,7 @@ CPPFLAGS := -I. -I.. -I../.. $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(foreach d,$(SUBDIRS-yes),$(d)-target) $(O_OBJ) +default: $(foreach d,$(SUBDIRS-yes),$(d)-target) $(O_OBJ:.o=.$(OBJ_EXT)) clean: $(foreach d,$(SUBDIRS-yes),$(d)-clean) rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/geojson/jsonc/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/geojson/jsonc/GNUmakefile --- gdal16/ogr/ogrsf_frmts/geojson/jsonc/GNUmakefile 2009-05-07 16:25:08.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/geojson/jsonc/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -17,9 +17,9 @@ CPPFLAGS := $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) -../../o/%.o: %.c +../../o/%.$(OBJ_EXT): %.c $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< clean: diff -ur gdal16/ogr/ogrsf_frmts/gml/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/gml/GNUmakefile --- gdal16/ogr/ogrsf_frmts/gml/GNUmakefile 2009-05-07 16:25:06.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/gml/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -23,14 +23,14 @@ # enable XML schema validation in the parser. #CPPFLAGS += -DOGR_GML_VALIDATION=1 -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o gmlview $(O_OBJ) -gmlview: gmlview.cpp $(CORE_OBJ) +gmlview: gmlview.cpp $(CORE_OBJ:.o=.$(OBJ_EXT)) $(CXX) $(CPPFLAGS) $(CFLAGS) $(LNK_FLAGS) \ - gmlview.cpp $(CORE_OBJ) $(GDAL_LIB) $(LIBS) \ + gmlview.cpp $(CORE_OBJ:.o=.$(OBJ_EXT)) $(GDAL_LIB) $(LIBS) \ -o gmlview diff -ur gdal16/ogr/ogrsf_frmts/gmt/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/gmt/GNUmakefile --- gdal16/ogr/ogrsf_frmts/gmt/GNUmakefile 2009-05-07 16:25:07.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/gmt/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -5,7 +5,7 @@ CPPFLAGS := -I.. -I../.. $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/gpx/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/gpx/GNUmakefile --- gdal16/ogr/ogrsf_frmts/gpx/GNUmakefile 2009-05-07 16:25:00.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/gpx/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -10,7 +10,7 @@ CPPFLAGS := -I.. -I../.. $(EXPAT_INCLUDE) $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/grass/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/grass/GNUmakefile --- gdal16/ogr/ogrsf_frmts/grass/GNUmakefile 2009-05-07 16:24:57.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/grass/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -6,7 +6,7 @@ CPPFLAGS := -DUSE_CPL -DGRASS_GISBASE=\"$(GRASS_GISBASE)\" -I.. -I../.. $(GRASS_INCLUDE) $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/idb/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/idb/GNUmakefile --- gdal16/ogr/ogrsf_frmts/idb/GNUmakefile 2009-05-07 16:25:08.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/idb/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -9,7 +9,7 @@ CPPFLAGS := -I.. -I../.. $(GDAL_INCLUDE) $(IDB_INC) $(IDB_DEFS) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/ili/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/ili/GNUmakefile --- gdal16/ogr/ogrsf_frmts/ili/GNUmakefile 2009-05-07 16:25:10.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/ili/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -17,7 +17,7 @@ CPPFLAGS := -I.. -I../.. $(GDAL_INCLUDE) $(XERCES_INCLUDE) $(CPPFLAGS) -default: $(foreach d,$(SUBDIRS-yes),$(d)-target) $(O_OBJ) +default: $(foreach d,$(SUBDIRS-yes),$(d)-target) $(O_OBJ:.o=.$(OBJ_EXT)) clean: $(foreach d,$(SUBDIRS-yes),$(d)-clean) rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/ili/iom/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/ili/iom/GNUmakefile --- gdal16/ogr/ogrsf_frmts/ili/iom/GNUmakefile 2009-05-07 16:25:09.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/ili/iom/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -9,9 +9,9 @@ CPPFLAGS := $(XERCES_INCLUDE) $(CPPFLAGS) -I.. -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) -../../o/%.o: %.cpp +../../o/%.$(OBJ_EXT): %.cpp $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< clean: diff -ur gdal16/ogr/ogrsf_frmts/ingres/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/ingres/GNUmakefile --- gdal16/ogr/ogrsf_frmts/ingres/GNUmakefile 2009-05-07 16:25:07.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/ingres/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -8,7 +8,7 @@ CPPFLAGS := -I.. -I../.. $(GDAL_INCLUDE) $(INGRES_INC) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/kml/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/kml/GNUmakefile --- gdal16/ogr/ogrsf_frmts/kml/GNUmakefile 2009-05-07 16:25:07.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/kml/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -18,7 +18,7 @@ #CFLAGS := $(filter-out -Wall,$(CFLAGS)) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o kmlview $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/mem/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/mem/GNUmakefile --- gdal16/ogr/ogrsf_frmts/mem/GNUmakefile 2009-05-07 16:25:03.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/mem/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -6,7 +6,7 @@ CPPFLAGS := -I.. -I../.. $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/mitab/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/mitab/GNUmakefile --- gdal16/ogr/ogrsf_frmts/mitab/GNUmakefile 2009-05-07 16:25:00.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/mitab/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -16,7 +16,7 @@ CPPFLAGS := -I.. -I../.. $(GDAL_INCLUDE) $(CPPFLAGS) -DOGR \ -DMITAB_USE_OFTDATETIME -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/mysql/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/mysql/GNUmakefile --- gdal16/ogr/ogrsf_frmts/mysql/GNUmakefile 2009-05-07 16:25:08.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/mysql/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -7,7 +7,7 @@ CPPFLAGS := -I.. -I../.. $(GDAL_INCLUDE) $(MYSQL_INC) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/ntf/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/ntf/GNUmakefile --- gdal16/ogr/ogrsf_frmts/ntf/GNUmakefile 2009-05-07 16:24:57.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/ntf/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -9,12 +9,12 @@ CPPFLAGS := -I.. -I../.. $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -ntfdump$(EXE): ntfdump.o - $(LD) $(LDFLAGS) ntfdump.o $(CONFIG_LIBS) -o ntfdump$(EXE) +ntfdump$(EXE): ntfdump.$(OBJ_EXT) + $(LD) $(LDFLAGS) ntfdump.$(OBJ_EXT) $(CONFIG_LIBS) -o ntfdump$(EXE) diff -ur gdal16/ogr/ogrsf_frmts/oci/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/oci/GNUmakefile --- gdal16/ogr/ogrsf_frmts/oci/GNUmakefile 2009-05-07 16:25:02.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/oci/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -9,7 +9,7 @@ CPPFLAGS := $(GDAL_INCLUDE) $(OCI_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/odbc/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/odbc/GNUmakefile --- gdal16/ogr/ogrsf_frmts/odbc/GNUmakefile 2009-05-07 16:25:08.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/odbc/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -7,7 +7,7 @@ CPPFLAGS := $(GDAL_INCLUDE) -I.. -I../.. $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/ogdi/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/ogdi/GNUmakefile --- gdal16/ogr/ogrsf_frmts/ogdi/GNUmakefile 2009-05-07 16:24:57.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/ogdi/GNUmakefile 2009-05-07 17:17:34.000000000 -0500 @@ -6,7 +6,7 @@ CPPFLAGS := $(GDAL_INCLUDE) $(OGDI_INCLUDE) $(PROJ_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) $(OBJ): ogrogdi.h diff -ur gdal16/ogr/ogrsf_frmts/pg/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/pg/GNUmakefile --- gdal16/ogr/ogrsf_frmts/pg/GNUmakefile 2009-05-07 16:25:01.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/pg/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -7,7 +7,7 @@ CPPFLAGS := $(GDAL_INCLUDE) $(PG_INC) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/pgeo/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/pgeo/GNUmakefile --- gdal16/ogr/ogrsf_frmts/pgeo/GNUmakefile 2009-05-07 16:24:58.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/pgeo/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -7,7 +7,7 @@ CPPFLAGS := $(GDAL_INCLUDE) -I.. -I../.. $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/rec/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/rec/GNUmakefile --- gdal16/ogr/ogrsf_frmts/rec/GNUmakefile 2009-05-07 16:25:02.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/rec/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -6,7 +6,7 @@ CPPFLAGS := -I.. -I../.. $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/s57/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/s57/GNUmakefile --- gdal16/ogr/ogrsf_frmts/s57/GNUmakefile 2009-05-07 16:25:10.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/s57/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -12,18 +12,18 @@ CPPFLAGS := -I.. -I../.. -I$(ISODIR) $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o s57dump$(EXE) mks57$(EXE) $(O_OBJ) all: default s57dump$(EXE) mks57$(EXE) -s57dump$(EXE): s57dump.o - $(LD) $(LDFLAGS) s57dump.o $(CONFIG_LIBS) -o s57dump$(EXE) +s57dump$(EXE): s57dump.$(OBJ_EXT) + $(LD) $(LDFLAGS) s57dump.$(OBJ_EXT) $(CONFIG_LIBS) -o s57dump$(EXE) -mks57$(EXE): mks57.o - $(LD) $(LDFLAGS) mks57.o $(CONFIG_LIBS) -o mks57$(EXE) +mks57$(EXE): mks57.$(OBJ_EXT) + $(LD) $(LDFLAGS) mks57.$(OBJ_EXT) $(CONFIG_LIBS) -o mks57$(EXE) -write_soundg$(EXE): write_soundg.o - $(LD) $(LDFLAGS) write_soundg.o $(CONFIG_LIBS) -o write_soundg$(EXE) +write_soundg$(EXE): write_soundg.$(OBJ_EXT) + $(LD) $(LDFLAGS) write_soundg.$(OBJ_EXT) $(CONFIG_LIBS) -o write_soundg$(EXE) diff -ur gdal16/ogr/ogrsf_frmts/sde/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/sde/GNUmakefile --- gdal16/ogr/ogrsf_frmts/sde/GNUmakefile 2009-05-07 16:25:09.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/sde/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -6,7 +6,7 @@ CPPFLAGS := $(GDAL_INCLUDE) $(SDE_INC) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/sdts/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/sdts/GNUmakefile --- gdal16/ogr/ogrsf_frmts/sdts/GNUmakefile 2009-05-07 16:25:03.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/sdts/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -14,7 +14,7 @@ CPPFLAGS := -I.. -I../.. -I$(SDTSDIR) -I$(ISODIR) $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o *-marker $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/shape/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/shape/GNUmakefile --- gdal16/ogr/ogrsf_frmts/shape/GNUmakefile 2009-05-07 16:25:01.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/shape/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -8,7 +8,7 @@ CPPFLAGS := -DSAOffset=vsi_l_offset -DUSE_CPL \ -I.. -I../.. $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) $(OBJ) $(O_OBJ): ogrshape.h shapefil.h diff -ur gdal16/ogr/ogrsf_frmts/sqlite/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/sqlite/GNUmakefile --- gdal16/ogr/ogrsf_frmts/sqlite/GNUmakefile 2009-05-07 16:25:08.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/sqlite/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -7,7 +7,7 @@ CPPFLAGS := -I.. $(GDAL_INCLUDE) $(SQLITE_INC) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/tiger/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/tiger/GNUmakefile --- gdal16/ogr/ogrsf_frmts/tiger/GNUmakefile 2009-05-07 16:25:03.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/tiger/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -34,10 +34,10 @@ LIBS := $(GDAL_LIB) $(LIBS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) -tigerinfo$(EXE): tigerinfo.o - $(LD) $(LDFLAGS) tigerinfo.o $(CONFIG_LIBS) -o tigerinfo$(EXE) +tigerinfo$(EXE): tigerinfo.$(OBJ_EXT) + $(LD) $(LDFLAGS) tigerinfo.$(OBJ_EXT) $(CONFIG_LIBS) -o tigerinfo$(EXE) diff -ur gdal16/ogr/ogrsf_frmts/vrt/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/vrt/GNUmakefile --- gdal16/ogr/ogrsf_frmts/vrt/GNUmakefile 2009-05-07 16:25:03.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/vrt/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -6,7 +6,7 @@ CPPFLAGS := -I.. -I../.. $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) diff -ur gdal16/ogr/ogrsf_frmts/xplane/GNUmakefile gdal16-090507/ogr/ogrsf_frmts/xplane/GNUmakefile --- gdal16/ogr/ogrsf_frmts/xplane/GNUmakefile 2009-05-07 16:24:58.000000000 -0500 +++ gdal16-090507/ogr/ogrsf_frmts/xplane/GNUmakefile 2009-05-07 17:16:27.000000000 -0500 @@ -8,7 +8,7 @@ CPPFLAGS := -I.. -I../.. $(GDAL_INCLUDE) $(CPPFLAGS) -default: $(O_OBJ) +default: $(O_OBJ:.o=.$(OBJ_EXT)) clean: rm -f *.o $(O_OBJ) test_geo_utils$(EXE) @@ -17,5 +17,5 @@ ogr_xplane_apt_reader.h ogr_xplane_nav_reader.h \ ogr_xplane_fix_reader.h ogr_xplane_awy_reader.h ../../ogr_geometry.h -test_geo_utils$(EXE): test_geo_utils.o ogr_xplane_geo_utils.o - $(LD) $(LDFLAGS) test_geo_utils.o ogr_xplane_geo_utils.o -o test_geo_utils$(EXE) -lm \ No newline at end of file +test_geo_utils$(EXE): test_geo_utils.$(OBJ_EXT) ogr_xplane_geo_utils.$(OBJ_EXT) + $(LD) $(LDFLAGS) test_geo_utils.$(OBJ_EXT) ogr_xplane_geo_utils.$(OBJ_EXT) -o test_geo_utils$(EXE) -lm \ No newline at end of file diff -ur gdal16/port/GNUmakefile gdal16-090507/port/GNUmakefile --- gdal16/port/GNUmakefile 2009-05-07 16:24:51.000000000 -0500 +++ gdal16-090507/port/GNUmakefile 2009-05-07 17:12:45.000000000 -0500 @@ -37,7 +37,7 @@ CPPFLAGS := $(CPPFLAGS) -DHAVE_LIBZ endif -default: $(OBJ) +default: $(OBJ:.o=.$(OBJ_EXT)) clean: $(RM) *.o $(LIB)