[GRASS-SVN] r55634 - in grass/branches/releasebranch_6_4: display/d.what.vect lib/form vector/v.what

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2013-04-04 16:32:46 -0700 (Thu, 04 Apr 2013)
New Revision: 55634

Modified:
   grass/branches/releasebranch_6_4/display/d.what.vect/Makefile
   grass/branches/releasebranch_6_4/lib/form/Makefile
   grass/branches/releasebranch_6_4/vector/v.what/Makefile
Log:
libform can be 64bit on OSX, only form program must be made 32bit to match tcltk

Modified: grass/branches/releasebranch_6_4/display/d.what.vect/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/display/d.what.vect/Makefile	2013-04-04 23:28:36 UTC (rev 55633)
+++ grass/branches/releasebranch_6_4/display/d.what.vect/Makefile	2013-04-04 23:32:46 UTC (rev 55634)
@@ -12,12 +12,6 @@
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-# substitute OSX arch flags for tcltk
-ifneq ($(MACOSX_ARCHS),)
-CFLAGS := $(subst $(MACOSX_ARCHS),,$(CFLAGS)) $(MACOSX_ARCHS_TCLTK)
-LDFLAGS := $(subst $(MACOSX_ARCHS),,$(LDFLAGS)) $(MACOSX_ARCHS_TCLTK)
-endif
-
 default: cmd
 
 

Modified: grass/branches/releasebranch_6_4/lib/form/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/lib/form/Makefile	2013-04-04 23:28:36 UTC (rev 55633)
+++ grass/branches/releasebranch_6_4/lib/form/Makefile	2013-04-04 23:32:46 UTC (rev 55634)
@@ -22,8 +22,11 @@
 
 # substitute OSX arch flags for tcltk
 ifneq ($(MACOSX_ARCHS),)
-CFLAGS := $(subst $(MACOSX_ARCHS),,$(CFLAGS)) $(MACOSX_ARCHS_TCLTK)
-LDFLAGS := $(subst $(MACOSX_ARCHS),,$(LDFLAGS)) $(MACOSX_ARCHS_TCLTK)
+TCFLAGS := $(subst $(MACOSX_ARCHS),,$(CFLAGS)) $(MACOSX_ARCHS_TCLTK)
+TLDFLAGS := $(subst $(MACOSX_ARCHS),,$(LDFLAGS)) $(MACOSX_ARCHS_TCLTK)
+else
+TCFLAGS := $(CFLAGS)
+TLDFLAGS := $(LDFLAGS)
 endif
 
 default: lib $(GTCLTKFORM)
@@ -50,5 +53,14 @@
 else
 $(FORMPROG): $(OBJDIR)/form.o | $(FORMDIR)
 endif
-	$(CC) $(LDFLAGS) -o $@ $(OBJDIR)/form.o $(DBMILIB) $(GISLIB) $(DATETIMELIB) \
+	$(CC) $(TLDFLAGS) -o $@ $(OBJDIR)/form.o $(DBMILIB) $(GISLIB) $(DATETIMELIB) \
 				$(TCLTKLIBPATH) $(TCLTKLIBS) $(MATHLIB) $(XDRLIB)
+
+ifeq ($(BROKEN_MAKE),)
+$(OBJDIR)/form.o : form.c | $(OBJDIR)
+	$(CC) $(TCFLAGS) $(EXTRA_CFLAGS) $(NLS_CFLAGS) $(INC) -o $@ -c $<
+else
+$(OBJDIR)/form.o : form.c
+	$(MAKE) $(OBJDIR)
+	$(CC) $(TCFLAGS) $(EXTRA_CFLAGS) $(NLS_CFLAGS) $(INC) -o $@ -c $<
+endif

Modified: grass/branches/releasebranch_6_4/vector/v.what/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.what/Makefile	2013-04-04 23:28:36 UTC (rev 55633)
+++ grass/branches/releasebranch_6_4/vector/v.what/Makefile	2013-04-04 23:32:46 UTC (rev 55634)
@@ -12,12 +12,6 @@
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
-# substitute OSX arch flags for tcltk
-ifneq ($(MACOSX_ARCHS),)
-CFLAGS := $(subst $(MACOSX_ARCHS),,$(CFLAGS)) $(MACOSX_ARCHS_TCLTK)
-LDFLAGS := $(subst $(MACOSX_ARCHS),,$(LDFLAGS)) $(MACOSX_ARCHS_TCLTK)
-endif
-
 default: cmd