Clean up build system, particularly with regard to Multi.make

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@33011 15284696-431f-4ddb-bdfa-cd5b030d7da7

db/base/Makefile

@@ -7,14 +7,16 @@ DEPENDENCIES = $(GISDEP) $(DBMIDEP)
 #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
-

general/g.parser/Makefile

@@ -7,8 +7,6 @@ DEPENDENCIES= $(GISDEP)
 
 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

general/manage/cmd/Makefile

@@ -3,6 +3,11 @@ MODULE_TOPDIR = ../../..
 
 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 @@ DEPENDENCIES = $(GISDEP) $(VECTDEP) $(DBMIDEP) $(MANAGEDEP) $(G3DDEP)
 
 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)
-

imagery/i.atcorr/Makefile

@@ -2,15 +2,11 @@ MODULE_TOPDIR = ../..
 
 PGM = i.atcorr
 
-MOD_OBJS = $(subst .cpp,.o,$(wildcard *.cpp))
-
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
 LIBES = $(GISLIB) 
 DEPENDENCIES = $(DEPGISLIB)
 
-default: cmd
-
-$(BIN)/$(PGM)$(EXE): $(ARCH_CMD_OBJS) $(DEPENDENCIES) 
-	$(CXX) $(LDFLAGS) $(XTRA_LDFLAGS) $(EXTRA_CFLAGS) $(NLS_CFLAGS) -o $@ $(ARCH_CMD_OBJS) $(FMODE_OBJ) $(LIBES) $(MATHLIB) $(XDRLIB)
+LINK = $(CXX)
 
+default: cmd

include/Make/Etc.make

@@ -12,6 +12,6 @@ include $(MODULE_TOPDIR)/include/Make/Rules.make
 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

include/Make/Grass.make

@@ -61,9 +61,9 @@ GRASS_VERSION_FILE    = $(ETC)/VERSION
 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

include/Make/Html.make

@@ -19,7 +19,7 @@ htmldesc = \
 	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 \

include/Make/Module.make

@@ -11,7 +11,7 @@ include $(MODULE_TOPDIR)/include/Make/Rules.make
 
 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

include/Make/Multi.make

@@ -5,13 +5,24 @@ include $(MODULE_TOPDIR)/include/Make/Platform.make
 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))))

include/Make/Rules.make

@@ -10,19 +10,11 @@ endif
 
 # 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
-
-ifndef CMD_OBJS
-CMD_OBJS := $(MOD_OBJS)
-endif
-
-ifndef ARCH_CMD_OBJS
-ARCH_CMD_OBJS := $(foreach obj,$(CMD_OBJS),OBJ.$(ARCH)/$(obj))
-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))
 
 $(OBJDIR):
 	-test -d $(OBJDIR) || $(MKDIR) $(OBJDIR)
@@ -33,6 +25,8 @@ BROKEN_MAKE=1
 endif
 endif
 
+LINK = $(CC)
+
 # default cc rules
 ifeq ($(BROKEN_MAKE),)
 $(OBJDIR)/%.o : %.c $(LOCAL_HEADERS) $(EXTRA_HEADERS) | $(OBJDIR)

lib/gis/Makefile

@@ -3,6 +3,7 @@ MODULE_TOPDIR = ../..
 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 @@ COLORFILES := $(patsubst colors/%,$(ETC)/colors/%,$(COLORSRC))
 ifneq ($(USE_LARGEFILES),)
 	EXTRA_CFLAGS = -D_FILE_OFFSET_BITS=64
 endif
+
 ifneq ($(GDAL_LINK),)
 EXTRA_CFLAGS += -DGDAL_LINK
 EXTRA_INC += $(PROJINC) $(GDALCFLAGS)

raster/r.mapcalc/Makefile

@@ -7,79 +7,13 @@ PROGRAMS = $(PGM2) $(PGM3)
 EXTRA_HEADERS = y.tab.h
 EXTRA_CLEAN_FILES = y.tab.c y.tab.h lex.yy.c y.output lex.backup
 
-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
+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))
 
-LIST3 =	$(COMMON) \
-	$(OBJDIR)/map3.o \
-	$(OBJDIR)/xcoor3.o \
-	$(OBJDIR)/xres3.o
+include $(MODULE_TOPDIR)/include/Make/Multi.make
 
 EXTRA_CFLAGS = $(READLINEINCPATH)
 LIBES2 = $(GISLIB) $(BTREELIB) $(ROWIOLIB) $(READLINELIBPATH) $(READLINELIB) $(HISTORYLIB)
@@ -87,11 +21,8 @@ LIBES3 = $(G3DLIB) $(GISLIB) $(BTREELIB) $(READLINELIBPATH) $(READLINELIB) $(HIS
 
 default: multi
 
-$(BIN)/$(PGM2)$(EXE): $(LIST2) $(DEPLIBS2)
-	$(CC) $(LDFLAGS) -o $@ $(LIST2) $(FMODE_OBJ) $(LIBES2) $(MATHLIB) $(XDRLIB)
-
-$(BIN)/$(PGM3)$(EXE): $(LIST3) $(DEPLIBS3)
-	$(CC) $(LDFLAGS) -o $@ $(LIST3) $(FMODE_OBJ) $(LIBES3) $(MATHLIB) $(XDRLIB)
+$(BIN)/$(PGM2)$(EXE): LIBES = $(LIBES2)
+$(BIN)/$(PGM3)$(EXE): LIBES = $(LIBES3)
 
 y.tab.c y.tab.h: mapcalc.y
 	$(YACC) -b y -d mapcalc.y

raster/r.terraflow/Makefile

@@ -2,59 +2,16 @@ MODULE_TOPDIR = ../..
 
 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 $@
-
-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)
+LINK = $(CXX)
 
-$(BIN)/$(PGM).short$(EXE): $(SHORT_OBJ) $(DEPLIBS)
-	$(CXX) -DELEV_SHORT $(LDFLAGS) -o $@ $(SHORT_OBJ) $(LIBS) $(MATHLIB) \
-	$(XDRLIB)
+default: cmd

raster/r.univar/Makefile

@@ -6,12 +6,9 @@ DEPENDENCIES = $(G3DDEP) $(GISDEP)
 
 PROGRAMS = r.univar r3.univar
 
-include $(MODULE_TOPDIR)/include/Make/Multi.make
+r_univar_OBJS = r.univar_main.o sort.o stats.o
+r3_univar_OBJS = r3.univar_main.o sort.o stats.o
 
-R3UNIVAR = $(BIN)/r3.univar$(EXE)
-RUNIVAR = $(BIN)/r.univar$(EXE)
+include $(MODULE_TOPDIR)/include/Make/Multi.make
 
 default: multi
-
-$(BIN)/%$(EXE): $(OBJDIR)/%_main.o $(OBJDIR)/sort.o $(OBJDIR)/stats.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(FMODE_OBJ) $(LIBES) $(XDRLIB) $(MATHLIB)

raster3d/base/Makefile

@@ -6,13 +6,11 @@ DEPENDENCIES = $(G3DDEP) $(GISDEP)
 
 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

vector/v.voronoi/Makefile

@@ -9,10 +9,9 @@ PROGRAMS = $(VORONOI) $(DELAUNAY)
 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)
-
-DELAUNAY_OBJS = dt_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)
 
+v_delaunay_OBJS = dt_main.o vo_extend.o vo_write.o dt_write.o $(SWEEP_OBJS)
 
 LIBES = $(VECTLIB) $(GISLIB)
 DEPENDENCIES= $(VECTDEP) $(GISDEP)
@@ -21,15 +20,4 @@ EXTRA_CFLAGS = $(VECT_CFLAGS)
 
 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)
-