[GRASS-SVN] r33011 - in grass/trunk: db/base general/g.parser
general/manage/cmd imagery/i.atcorr include/Make lib/gis
raster/r.mapcalc raster/r.terraflow raster/r.univar
raster3d/base vector/v.voronoi
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Aug 22 17:59:09 EDT 2008
Author: glynn
Date: 2008-08-22 17:59:09 -0400 (Fri, 22 Aug 2008)
New Revision: 33011
Modified:
grass/trunk/db/base/Makefile
grass/trunk/general/g.parser/Makefile
grass/trunk/general/manage/cmd/Makefile
grass/trunk/imagery/i.atcorr/Makefile
grass/trunk/include/Make/Etc.make
grass/trunk/include/Make/Grass.make
grass/trunk/include/Make/Html.make
grass/trunk/include/Make/Module.make
grass/trunk/include/Make/Multi.make
grass/trunk/include/Make/Rules.make
grass/trunk/lib/gis/Makefile
grass/trunk/raster/r.mapcalc/Makefile
grass/trunk/raster/r.terraflow/Makefile
grass/trunk/raster/r.univar/Makefile
grass/trunk/raster3d/base/Makefile
grass/trunk/vector/v.voronoi/Makefile
Log:
Clean up build system, particularly with regard to Multi.make
Modified: grass/trunk/db/base/Makefile
===================================================================
--- grass/trunk/db/base/Makefile 2008-08-22 21:56:24 UTC (rev 33010)
+++ grass/trunk/db/base/Makefile 2008-08-22 21:59:09 UTC (rev 33011)
@@ -7,14 +7,16 @@
#not used: db.createdb db.dropdb db.databases db.droptable
PROGRAMS = db.columns db.copy db.describe db.drivers db.execute db.select db.tables db.connect
+db_columns_OBJS = columns.o
+db_copy_OBJS = copy.o
+db_describe_OBJS = describe.o printtab.o
+db_drivers_OBJS = drivers.o
+db_execute_OBJS = execute.o
+db_select_OBJS = select.o printtab.o
+db_tables_OBJS = tables.o
+db_connect_OBJS = connect.o
+
include $(MODULE_TOPDIR)/include/Make/Multi.make
default: multi
-$(BIN)/db.%$(EXE): $(OBJDIR)/%.o
- $(CC) $(LDFLAGS) -o $@ $^ $(FMODE_OBJ) $(LIBES) $(XDRLIB) $(MATHLIB)
-
-$(BIN)/db.describe$(EXE): $(OBJDIR)/printtab.o
-
-$(BIN)/db.select$(EXE): $(OBJDIR)/printtab.o
-
Modified: grass/trunk/general/g.parser/Makefile
===================================================================
--- grass/trunk/general/g.parser/Makefile 2008-08-22 21:56:24 UTC (rev 33010)
+++ grass/trunk/general/g.parser/Makefile 2008-08-22 21:59:09 UTC (rev 33011)
@@ -7,8 +7,6 @@
include $(MODULE_TOPDIR)/include/Make/Module.make
-default: cmd
+HTMLSRC=
-#hardcoded here, this is an exeption due to the g.parser specialities:
-$(PGM).tmp.html:
- > $@
+default: cmd
Modified: grass/trunk/general/manage/cmd/Makefile
===================================================================
--- grass/trunk/general/manage/cmd/Makefile 2008-08-22 21:56:24 UTC (rev 33010)
+++ grass/trunk/general/manage/cmd/Makefile 2008-08-22 21:59:09 UTC (rev 33011)
@@ -3,6 +3,11 @@
PROGRAMS = g.copy g.list g.remove g.rename
+g_copy_OBJS = copy.o init.o
+g_list_OBJS = list.o init.o
+g_remove_OBJS = remove.o init.o
+g_rename_OBJS = rename.o init.o
+
include $(MODULE_TOPDIR)/include/Make/Multi.make
LIBES = $(MANAGELIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(G3DLIB)
@@ -11,22 +16,5 @@
EXTRA_INC = -I..
-COPY_MOD = $(BIN)/g.copy$(EXE)
-LIST_MOD = $(BIN)/g.list$(EXE)
-REMOVE_MOD = $(BIN)/g.remove$(EXE)
-RENAME_MOD = $(BIN)/g.rename$(EXE)
-
default: multi
-$(COPY_MOD): $(OBJDIR)/copy.o $(LIST)
- $(CC) $(LDFLAGS) -o $@ $^ $(FMODE_OBJ) $(LIBES) $(MATHLIB) $(XDRLIB)
-
-$(LIST_MOD): $(OBJDIR)/list.o $(LIST)
- $(CC) $(LDFLAGS) -o $@ $^ $(FMODE_OBJ) $(LIBES) $(MATHLIB) $(XDRLIB)
-
-$(REMOVE_MOD): $(OBJDIR)/remove.o $(LIST)
- $(CC) $(LDFLAGS) -o $@ $^ $(FMODE_OBJ) $(LIBES) $(MATHLIB) $(XDRLIB)
-
-$(RENAME_MOD): $(OBJDIR)/rename.o $(LIST)
- $(CC) $(LDFLAGS) -o $@ $^ $(FMODE_OBJ) $(LIBES) $(MATHLIB) $(XDRLIB)
-
Modified: grass/trunk/imagery/i.atcorr/Makefile
===================================================================
--- grass/trunk/imagery/i.atcorr/Makefile 2008-08-22 21:56:24 UTC (rev 33010)
+++ grass/trunk/imagery/i.atcorr/Makefile 2008-08-22 21:59:09 UTC (rev 33011)
@@ -2,15 +2,11 @@
PGM = i.atcorr
-MOD_OBJS = $(subst .cpp,.o,$(wildcard *.cpp))
-
include $(MODULE_TOPDIR)/include/Make/Module.make
LIBES = $(GISLIB)
DEPENDENCIES = $(DEPGISLIB)
-default: cmd
+LINK = $(CXX)
-$(BIN)/$(PGM)$(EXE): $(ARCH_CMD_OBJS) $(DEPENDENCIES)
- $(CXX) $(LDFLAGS) $(XTRA_LDFLAGS) $(EXTRA_CFLAGS) $(NLS_CFLAGS) -o $@ $(ARCH_CMD_OBJS) $(FMODE_OBJ) $(LIBES) $(MATHLIB) $(XDRLIB)
-
+default: cmd
Modified: grass/trunk/include/Make/Etc.make
===================================================================
--- grass/trunk/include/Make/Etc.make 2008-08-22 21:56:24 UTC (rev 33010)
+++ grass/trunk/include/Make/Etc.make 2008-08-22 21:59:09 UTC (rev 33011)
@@ -12,6 +12,6 @@
etc: $(ETC)/$(PGM)$(EXE) html
$(ETC)/$(PGM)$(EXE): $(ARCH_CMD_OBJS) $(DEPENDENCIES)
- $(CC) $(LDFLAGS) $(XTRA_LDFLAGS) -o $@ $(ARCH_CMD_OBJS) $(FMODE_OBJ) $(LIBES) $(MATHLIB) $(XDRLIB)
+ $(LINK) $(LDFLAGS) $(XTRA_LDFLAGS) -o $@ $(ARCH_CMD_OBJS) $(FMODE_OBJ) $(LIBES) $(MATHLIB) $(XDRLIB)
.PHONY: etc
Modified: grass/trunk/include/Make/Grass.make
===================================================================
--- grass/trunk/include/Make/Grass.make 2008-08-22 21:56:24 UTC (rev 33010)
+++ grass/trunk/include/Make/Grass.make 2008-08-22 21:59:09 UTC (rev 33011)
@@ -61,9 +61,9 @@
GRASS_BUILD_FILE = $(ETC)/BUILD
##################### other #############################################
-CFLAGS = $(INC) $(COMPILE_FLAGS) $(USE_TERMIO)
-CXXFLAGS = $(INC) $(COMPILE_FLAGS_CXX) $(USE_TERMIO)
-LDFLAGS = $(LIBPATH) $(LINK_FLAGS) $(LD_SEARCH_FLAGS) $(PQLIBPATH) $(USE_TERMIO)
+CFLAGS = $(INC) $(COMPILE_FLAGS)
+CXXFLAGS = $(INC) $(COMPILE_FLAGS_CXX)
+LDFLAGS = $(LIBPATH) $(LINK_FLAGS) $(LD_SEARCH_FLAGS) $(PQLIBPATH)
VECT_CFLAGS = $(GDALCFLAGS)
# Object with _fmode which must be linked to each executable on Windows
Modified: grass/trunk/include/Make/Html.make
===================================================================
--- grass/trunk/include/Make/Html.make 2008-08-22 21:56:24 UTC (rev 33010)
+++ grass/trunk/include/Make/Html.make 2008-08-22 21:59:09 UTC (rev 33011)
@@ -19,7 +19,7 @@
LC_ALL=C \
$(1) --html-description < /dev/null | grep -v '</body>\|</html>' > $(2)
-$(HTMLDIR)/%.html: %.html %.tmp.html
+$(HTMLDIR)/%.html: %.html %.tmp.html $(HTMLSRC)
-test -d $(HTMLDIR) || $(MKDIR) $(HTMLDIR)
$(MODULE_TOPDIR)/tools/mkhtml.sh $* > $@
-for file in *.png *.jpg ; do \
Modified: grass/trunk/include/Make/Module.make
===================================================================
--- grass/trunk/include/Make/Module.make 2008-08-22 21:56:24 UTC (rev 33010)
+++ grass/trunk/include/Make/Module.make 2008-08-22 21:59:09 UTC (rev 33011)
@@ -11,7 +11,7 @@
cmd: $(BIN)/$(PGM)$(EXE) html
-$(BIN)/$(PGM)$(EXE): $(ARCH_CMD_OBJS) $(DEPENDENCIES)
- $(CC) $(LDFLAGS) $(XTRA_LDFLAGS) -o $@ $(ARCH_CMD_OBJS) $(FMODE_OBJ) $(LIBES) $(MATHLIB) $(XDRLIB)
+$(BIN)/$(PGM)$(EXE): $(ARCH_CMD_OBJS) $(DEPENDENCIES)
+ $(LINK) $(LDFLAGS) $(XTRA_LDFLAGS) -o $@ $(ARCH_CMD_OBJS) $(FMODE_OBJ) $(LIBES) $(MATHLIB) $(XDRLIB)
.PHONY: cmd
Modified: grass/trunk/include/Make/Multi.make
===================================================================
--- grass/trunk/include/Make/Multi.make 2008-08-22 21:56:24 UTC (rev 33010)
+++ grass/trunk/include/Make/Multi.make 2008-08-22 21:59:09 UTC (rev 33011)
@@ -5,13 +5,24 @@
include $(MODULE_TOPDIR)/include/Make/Grass.make
include $(MODULE_TOPDIR)/include/Make/Rules.make
-multi: progs inter htmlmulti
+PROGFILES = $(patsubst %,$(BIN)/%$(EXE),$(PROGRAMS))
+HTMLFILES = $(patsubst %,$(HTMLDIR)/%.html,$(PROGRAMS))
-progs: $(patsubst %,$(BIN)/%$(EXE),$(PROGRAMS))
+multi: progs htmlmulti
-inter: $(patsubst %,%.tmp.html,$(PROGRAMS))
+progs: $(PROGFILES)
-htmlmulti: $(patsubst %,$(HTMLDIR)/%.html,$(PROGRAMS))
+htmlmulti: $(HTMLFILES)
-%.tmp.html: $(BIN)/%$(EXE)
- $(call htmldesc,$<,$@)
+$(BIN)/%$(EXE): $(DEPENDENCIES)
+ $(LINK) $(LDFLAGS) $(XTRA_LDFLAGS) -o $@ $(filter %.o,$^) $(FMODE_OBJ) $(LIBES) $(MATHLIB) $(XDRLIB)
+
+define objs_rule
+$(BIN)/$(1)$(EXE): $$(patsubst %.o,$(OBJDIR)/%.o,$$($$(subst .,_,$(1)_OBJS)))
+$(HTMLDIR)/$(1).html: $(1).html $(1).tmp.html $(BIN)/$(1)$(EXE)
+$(1).tmp.html: $(BIN)/$(1)$(EXE)
+ $$(call htmldesc,$$<,$$@)
+.INTERMEDIATE: $(1).tmp.html
+endef
+
+$(foreach prog,$(PROGRAMS),$(eval $(call objs_rule,$(prog))))
Modified: grass/trunk/include/Make/Rules.make
===================================================================
--- grass/trunk/include/Make/Rules.make 2008-08-22 21:56:24 UTC (rev 33010)
+++ grass/trunk/include/Make/Rules.make 2008-08-22 21:59:09 UTC (rev 33011)
@@ -10,20 +10,12 @@
# for i18N support
DEFS=-DPACKAGE=\"$(PACKAGE)\"
-NLS_CFLAGS=$(ZLIBINCPATH) $(PICFLAGS) $(DEFS)
+NLS_CFLAGS=$(DEFS)
-ifndef MOD_OBJS
-MOD_OBJS := $(subst .c,.o,$(wildcard *.c))
-endif
+MOD_OBJS := $(subst .c,.o,$(wildcard *.c)) $(subst .cpp,.o,$(wildcard *.cpp)) $(subst .cc,.o,$(wildcard *.cc))
+CMD_OBJS = $(MOD_OBJS)
+ARCH_CMD_OBJS = $(patsubst %.o,$(OBJDIR)/%.o,$(CMD_OBJS))
-ifndef CMD_OBJS
-CMD_OBJS := $(MOD_OBJS)
-endif
-
-ifndef ARCH_CMD_OBJS
-ARCH_CMD_OBJS := $(foreach obj,$(CMD_OBJS),OBJ.$(ARCH)/$(obj))
-endif
-
$(OBJDIR):
-test -d $(OBJDIR) || $(MKDIR) $(OBJDIR)
@@ -33,6 +25,8 @@
endif
endif
+LINK = $(CC)
+
# default cc rules
ifeq ($(BROKEN_MAKE),)
$(OBJDIR)/%.o : %.c $(LOCAL_HEADERS) $(EXTRA_HEADERS) | $(OBJDIR)
Modified: grass/trunk/lib/gis/Makefile
===================================================================
--- grass/trunk/lib/gis/Makefile 2008-08-22 21:56:24 UTC (rev 33010)
+++ grass/trunk/lib/gis/Makefile 2008-08-22 21:59:09 UTC (rev 33011)
@@ -3,6 +3,7 @@
LIB_NAME = $(GIS_LIBNAME)
EXTRA_LIBS = $(XDRLIB) $(SOCKLIB) $(DATETIMELIB) $(INTLLIB) $(MATHLIB)
DATASRC = ellipse.table datum.table datumtransform.table FIPS.code state27 state83 projections gui.tcl
+EXTRA_INC = $(ZLIBINCPATH)
include $(MODULE_TOPDIR)/include/Make/Lib.make
include $(MODULE_TOPDIR)/include/Make/Doxygen.make
@@ -15,6 +16,7 @@
ifneq ($(USE_LARGEFILES),)
EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
endif
+
ifneq ($(GDAL_LINK),)
EXTRA_CFLAGS += -DGDAL_LINK
EXTRA_INC += $(PROJINC) $(GDALCFLAGS)
Modified: grass/trunk/raster/r.mapcalc/Makefile
===================================================================
--- grass/trunk/raster/r.mapcalc/Makefile 2008-08-22 21:56:24 UTC (rev 33010)
+++ grass/trunk/raster/r.mapcalc/Makefile 2008-08-22 21:59:09 UTC (rev 33011)
@@ -7,92 +7,23 @@
EXTRA_HEADERS = y.tab.h
EXTRA_CLEAN_FILES = y.tab.c y.tab.h lex.yy.c y.output lex.backup
+OBJS1 := y.tab.o lex.yy.o
+OBJS2 := $(filter-out $(OBJS1), $(patsubst %.c,%.o,$(wildcard *.c)))
+OBJS := $(OBJS1) $(OBJS2)
+r_mapcalc_OBJS := $(filter-out map3.o xcoor3.o xres3.o, $(OBJS))
+r3_mapcalc_OBJS := $(filter-out map.o xcoor.o xres.o, $(OBJS))
+
include $(MODULE_TOPDIR)/include/Make/Multi.make
-COMMON = \
- $(OBJDIR)/y.tab.o \
- $(OBJDIR)/lex.yy.o \
- \
- $(OBJDIR)/column_shift.o \
- $(OBJDIR)/evaluate.o \
- $(OBJDIR)/expression.o \
- $(OBJDIR)/function.o \
- $(OBJDIR)/check.o \
- $(OBJDIR)/main.o \
- \
- $(OBJDIR)/xabs.o \
- $(OBJDIR)/xadd.o \
- $(OBJDIR)/xand.o \
- $(OBJDIR)/xand2.o \
- $(OBJDIR)/xacos.o \
- $(OBJDIR)/xasin.o \
- $(OBJDIR)/xatan.o \
- $(OBJDIR)/xbitand.o \
- $(OBJDIR)/xbitnot.o \
- $(OBJDIR)/xbitor.o \
- $(OBJDIR)/xbitxor.o \
- $(OBJDIR)/xcos.o \
- $(OBJDIR)/xdiv.o \
- $(OBJDIR)/xdouble.o \
- $(OBJDIR)/xeq.o \
- $(OBJDIR)/xeval.o \
- $(OBJDIR)/xexp.o \
- $(OBJDIR)/xfloat.o \
- $(OBJDIR)/xge.o \
- $(OBJDIR)/xgraph.o \
- $(OBJDIR)/xgt.o \
- $(OBJDIR)/xif.o \
- $(OBJDIR)/xint.o \
- $(OBJDIR)/xisnull.o \
- $(OBJDIR)/xle.o \
- $(OBJDIR)/xlog.o \
- $(OBJDIR)/xlt.o \
- $(OBJDIR)/xmax.o \
- $(OBJDIR)/xmedian.o \
- $(OBJDIR)/xmin.o \
- $(OBJDIR)/xmod.o \
- $(OBJDIR)/xmode.o \
- $(OBJDIR)/xmul.o \
- $(OBJDIR)/xne.o \
- $(OBJDIR)/xneg.o \
- $(OBJDIR)/xnot.o \
- $(OBJDIR)/xnull.o \
- $(OBJDIR)/xor.o \
- $(OBJDIR)/xor2.o \
- $(OBJDIR)/xpow.o \
- $(OBJDIR)/xrand.o \
- $(OBJDIR)/xround.o \
- $(OBJDIR)/xrowcol.o \
- $(OBJDIR)/xshiftl.o \
- $(OBJDIR)/xshiftr.o \
- $(OBJDIR)/xshiftru.o \
- $(OBJDIR)/xsin.o \
- $(OBJDIR)/xsqrt.o \
- $(OBJDIR)/xsub.o \
- $(OBJDIR)/xtan.o
-
-LIST2 = $(COMMON) \
- $(OBJDIR)/map.o \
- $(OBJDIR)/xcoor.o \
- $(OBJDIR)/xres.o
-
-LIST3 = $(COMMON) \
- $(OBJDIR)/map3.o \
- $(OBJDIR)/xcoor3.o \
- $(OBJDIR)/xres3.o
-
EXTRA_CFLAGS = $(READLINEINCPATH)
LIBES2 = $(GISLIB) $(BTREELIB) $(ROWIOLIB) $(READLINELIBPATH) $(READLINELIB) $(HISTORYLIB)
LIBES3 = $(G3DLIB) $(GISLIB) $(BTREELIB) $(READLINELIBPATH) $(READLINELIB) $(HISTORYLIB)
default: multi
-$(BIN)/$(PGM2)$(EXE): $(LIST2) $(DEPLIBS2)
- $(CC) $(LDFLAGS) -o $@ $(LIST2) $(FMODE_OBJ) $(LIBES2) $(MATHLIB) $(XDRLIB)
+$(BIN)/$(PGM2)$(EXE): LIBES = $(LIBES2)
+$(BIN)/$(PGM3)$(EXE): LIBES = $(LIBES3)
-$(BIN)/$(PGM3)$(EXE): $(LIST3) $(DEPLIBS3)
- $(CC) $(LDFLAGS) -o $@ $(LIST3) $(FMODE_OBJ) $(LIBES3) $(MATHLIB) $(XDRLIB)
-
y.tab.c y.tab.h: mapcalc.y
$(YACC) -b y -d mapcalc.y
Modified: grass/trunk/raster/r.terraflow/Makefile
===================================================================
--- grass/trunk/raster/r.terraflow/Makefile 2008-08-22 21:56:24 UTC (rev 33010)
+++ grass/trunk/raster/r.terraflow/Makefile 2008-08-22 21:59:09 UTC (rev 33011)
@@ -2,59 +2,16 @@
PGM = r.terraflow
-PACKAGE = "grassmods"
+LIBES = $(GISLIB) $(IOSTREAMLIB)
+DEPENDENCIES = $(GISDEP) $(IOSTREAMDEP)
-HTMLSRC = $(BIN)/$(PGM)$(EXE)
+include $(MODULE_TOPDIR)/include/Make/Module.make
-include $(MODULE_TOPDIR)/include/Make/Platform.make
-include $(MODULE_TOPDIR)/include/Make/Grass.make
-include $(MODULE_TOPDIR)/include/Make/Rules.make
-
-SOURCES = main.cc common.cc stats.cc fill.cc types.cc ccforest.cc \
- nodata.cc plateau.cc direction.cc water.cc \
- filldepr.cc grid.cc genericWindow.cc \
- flow.cc sweep.cc weightWindow.cc
-
-OBJARCH=OBJ.$(ARCH)
-
-FLOAT_OBJ := $(patsubst %.cc, $(OBJARCH)/FLOAT/%.o, $(SOURCES))
-SHORT_OBJ := $(patsubst %.cc, $(OBJARCH)/SHORT/%.o, $(SOURCES))
-
-CXXFLAGS += -DUSER=\"$(USER)\" \
- -DNODATA_FIX -D_FILE_OFFSET_BITS=64
-
-LIBS = $(GISLIB) $(IOSTREAMLIB)
-DEPLIBS = $(GISDEP) $(IOSTREAMDEP)
-
-#Note: if a header file is modified, the .o files do not get rebuilt..
-# header files should be included as prerequisites, but does not work
-# because of GRASS scripts
-ifneq ($(BROKEN_MAKE),)
-$(OBJARCH)/FLOAT/%.o: %.cc $(LOCAL_HEADERS) $(OBJARCH)/FLOAT
-else
-$(OBJARCH)/FLOAT/%.o: %.cc $(LOCAL_HEADERS) | $(OBJARCH)/FLOAT
+EXTRA_CFLAGS = -DUSER=\"$(USER)\" -DNODATA_FIX -DELEV_FLOAT -Wno-sign-compare
+ifneq ($(USE_LARGEFILES),)
+ EXTRA_CFLAGS += -D_FILE_OFFSET_BITS=64
endif
- $(CXX) -c $(CXXFLAGS) $(NLS_CFLAGS) -DELEV_FLOAT $< -o $@
-ifneq ($(BROKEN_MAKE),)
-$(OBJARCH)/SHORT/%.o: %.cc $(LOCAL_HEADERS) $(OBJARCH)/SHORT
-else
-$(OBJARCH)/SHORT/%.o: %.cc $(LOCAL_HEADERS) | $(OBJARCH)/SHORT
-endif
- $(CXX) -c $(CXXFLAGS) $(NLS_CFLAGS) -DELEV_SHORT $< -o $@
+LINK = $(CXX)
-default: $(BIN)/$(PGM)$(EXE) $(BIN)/$(PGM).short$(EXE) html
-
-$(OBJARCH)/FLOAT:
- $(MKDIR) $@
-
-$(OBJARCH)/SHORT:
- $(MKDIR) $@
-
-$(BIN)/$(PGM)$(EXE): $(FLOAT_OBJ) $(DEPLIBS)
- $(CXX) -DELEV_FLOAT $(LDFLAGS) -o $@ $(FLOAT_OBJ) $(LIBS) $(MATHLIB) \
- $(XDRLIB)
-
-$(BIN)/$(PGM).short$(EXE): $(SHORT_OBJ) $(DEPLIBS)
- $(CXX) -DELEV_SHORT $(LDFLAGS) -o $@ $(SHORT_OBJ) $(LIBS) $(MATHLIB) \
- $(XDRLIB)
+default: cmd
Modified: grass/trunk/raster/r.univar/Makefile
===================================================================
--- grass/trunk/raster/r.univar/Makefile 2008-08-22 21:56:24 UTC (rev 33010)
+++ grass/trunk/raster/r.univar/Makefile 2008-08-22 21:59:09 UTC (rev 33011)
@@ -6,12 +6,9 @@
PROGRAMS = r.univar r3.univar
+r_univar_OBJS = r.univar_main.o sort.o stats.o
+r3_univar_OBJS = r3.univar_main.o sort.o stats.o
+
include $(MODULE_TOPDIR)/include/Make/Multi.make
-R3UNIVAR = $(BIN)/r3.univar$(EXE)
-RUNIVAR = $(BIN)/r.univar$(EXE)
-
default: multi
-
-$(BIN)/%$(EXE): $(OBJDIR)/%_main.o $(OBJDIR)/sort.o $(OBJDIR)/stats.o
- $(CC) $(LDFLAGS) -o $@ $^ $(FMODE_OBJ) $(LIBES) $(XDRLIB) $(MATHLIB)
Modified: grass/trunk/raster3d/base/Makefile
===================================================================
--- grass/trunk/raster3d/base/Makefile 2008-08-22 21:56:24 UTC (rev 33010)
+++ grass/trunk/raster3d/base/Makefile 2008-08-22 21:59:09 UTC (rev 33011)
@@ -6,13 +6,11 @@
PROGRAMS = r3.info r3.mask r3.null r3.timestamp
+r3_mask_OBJS = r3.mask.main.o mask_functions.o
+r3_null_OBJS = r3.null.main.o mask_functions.o
+r3_info_OBJS = r3.info.main.o
+r3_timestamp_OBJS = r3.timestamp.main.o
+
include $(MODULE_TOPDIR)/include/Make/Multi.make
default: multi
-
-$(BIN)/r3.%$(EXE): $(OBJDIR)/r3.%.main.o $(OBJDIR)/mask_functions.o
- $(CC) $(LDFLAGS) -o $@ $^ $(FMODE_OBJ) $(LIBES) $(XDRLIB) $(MATHLIB)
-
-$(BIN)/r3.mask$(EXE): $(OBJDIR)/mask_functions.o
-
-$(BIN)/r3.null$(EXE): $(OBJDIR)/mask_functions.o
Modified: grass/trunk/vector/v.voronoi/Makefile
===================================================================
--- grass/trunk/vector/v.voronoi/Makefile 2008-08-22 21:56:24 UTC (rev 33010)
+++ grass/trunk/vector/v.voronoi/Makefile 2008-08-22 21:59:09 UTC (rev 33011)
@@ -9,11 +9,10 @@
SWEEP_OBJS = sw_edgelist.o sw_geometry.o sw_heap.o sw_main.o sw_memory.o sw_output.o \
sw_voronoi.o
-VORONOI_OBJS = vo_main.o vo_extend.o vo_write.o dt_write.o $(SWEEP_OBJS)
+v_voronoi_OBJS = vo_main.o vo_extend.o vo_write.o dt_write.o $(SWEEP_OBJS)
-DELAUNAY_OBJS = dt_main.o vo_extend.o vo_write.o dt_write.o $(SWEEP_OBJS)
+v_delaunay_OBJS = dt_main.o vo_extend.o vo_write.o dt_write.o $(SWEEP_OBJS)
-
LIBES = $(VECTLIB) $(GISLIB)
DEPENDENCIES= $(VECTDEP) $(GISDEP)
EXTRA_INC = $(VECT_INC)
@@ -21,15 +20,4 @@
include $(MODULE_TOPDIR)/include/Make/Multi.make
-VORONOI_ARCH_OBJS := $(foreach obj,$(VORONOI_OBJS),$(OBJDIR)/$(obj))
-
-DELAUNAY_ARCH_OBJS := $(foreach obj,$(DELAUNAY_OBJS),$(OBJDIR)/$(obj))
-
default: multi
-
-$(BIN)/$(VORONOI)$(EXE): $(VORONOI_ARCH_OBJS)
- $(CC) $(LDFLAGS) -o $@ $^ $(FMODE_OBJ) $(LIBES) $(MATHLIB) $(XDRLIB)
-
-$(BIN)/$(DELAUNAY)$(EXE):$(DELAUNAY_ARCH_OBJS)
- $(CC) $(LDFLAGS) -o $@ $^ $(FMODE_OBJ) $(LIBES) $(MATHLIB) $(XDRLIB)
-
More information about the grass-commit
mailing list