[GRASS-SVN] r32691 - grass/trunk/raster/r.le/r.le.setup/polytocell

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Aug 11 19:55:18 EDT 2008


Author: glynn
Date: 2008-08-11 19:55:18 -0400 (Mon, 11 Aug 2008)
New Revision: 32691

Modified:
   grass/trunk/raster/r.le/r.le.setup/polytocell/Makefile
Log:
Use $(OBJDIR), remove private "clean" target


Modified: grass/trunk/raster/r.le/r.le.setup/polytocell/Makefile
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/polytocell/Makefile	2008-08-11 23:48:48 UTC (rev 32690)
+++ grass/trunk/raster/r.le/r.le.setup/polytocell/Makefile	2008-08-11 23:55:18 UTC (rev 32691)
@@ -1,13 +1,13 @@
 MODULE_TOPDIR = ../../../..
 
 OBJS = \
-	do_dots.o\
-	do_line.o\
-	find_area.o\
-	ply_t_bmif.o\
-	save_area.o\
-	wrte_recrd.o\
-	yadjust.o
+	$(OBJDIR)/do_dots.o\
+	$(OBJDIR)/do_line.o\
+	$(OBJDIR)/find_area.o\
+	$(OBJDIR)/ply_t_bmif.o\
+	$(OBJDIR)/save_area.o\
+	$(OBJDIR)/wrte_recrd.o\
+	$(OBJDIR)/yadjust.o
 
 LIBES = $(GISLIB)
 DEPENDENCIES= $(DEPGISLIB)
@@ -16,13 +16,9 @@
 
 default: $(ETC)/bmif_to_cell $(ETC)/poly_to_bmif
 
-$(ETC)/bmif_to_cell: bmf_to_cll.o $(DEPENDENCIES)
-	$(CC) $(LDFLAGS) -o $@ bmf_to_cll.o $(FMODE_OBJ) $(LIBES) $(MATHLIB) $(XDRLIB)
+$(ETC)/bmif_to_cell: $(OBJDIR)/bmf_to_cll.o $(DEPENDENCIES)
+	$(CC) $(LDFLAGS) -o $@ $< $(FMODE_OBJ) $(LIBES) $(MATHLIB) $(XDRLIB)
 
 $(ETC)/poly_to_bmif: $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(FMODE_OBJ)
+	$(CC) $(LDFLAGS) -o $@ $^ $(FMODE_OBJ)
 
-OBJS: ply_to_cll.h
-
-clean:
-	rm -f $(OBJS) bmf_to_cll.o



More information about the grass-commit mailing list