[GRASS-SVN] r35768 - grass/branches/releasebranch_6_4/lib/gis

[svn_grass at osgeo.org]

Author: neteler
Date: 2009-02-05 03:45:00 -0500 (Thu, 05 Feb 2009)
New Revision: 35768

Modified:
   grass/branches/releasebranch_6_4/lib/gis/Makefile
Log:
fix for trac #469 implemented (fix Windows binary mode + compilation)

Modified: grass/branches/releasebranch_6_4/lib/gis/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/lib/gis/Makefile	2009-02-05 08:44:38 UTC (rev 35767)
+++ grass/branches/releasebranch_6_4/lib/gis/Makefile	2009-02-05 08:45:00 UTC (rev 35768)
@@ -8,6 +8,9 @@
 DATASRC = ellipse.table datum.table datumtransform.table FIPS.code state27 state83 projections gui.tcl
 EXTRA_INC = $(ZLIBINCPATH)
 
+LIB_OBJS := $(subst .c,.o,$(wildcard *.c))
+LIB_OBJS := $(filter-out fmode.o dllmain.o,$(LIB_OBJS))
+
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
@@ -37,13 +40,8 @@
 
 endif
 
-default: lib $(FMODE_OBJ) $(DATAFILES) $(COLORFILES) $(ETC)/colors.desc $(ETC)/element_list
+default: $(DLLMAIN_OBJ) lib $(FMODE_OBJ) $(DATAFILES) $(COLORFILES) $(ETC)/colors.desc $(ETC)/element_list
 
-$(FMODE_OBJ): fmode.dat
-	@test -d $(OBJDIR) || mkdir $(OBJDIR)
-	cat fmode.dat > $(OBJDIR)/fmode.c
-	$(CC) $(CFLAGS) $(INC) -o $(FMODE_OBJ) -c $(OBJDIR)/fmode.c
-
 $(ETC)/colors:
 	$(MKDIR) $@