[Vm-dev] [commit][3714] Mac OS X build: Add dependency on the Makefile so that files get recompiled if

[commits at squeakvm.org]

Revision: 3714
Author:   eliot
Date:     2016-05-11 11:59:18 -0700 (Wed, 11 May 2016)
Log Message:
-----------
Mac OS X build: Add dependency on the Makefile so that files get recompiled if
e.g. a plugin's special Makefile changes.  Remove obsolete version cruft from
the 64-bit Makefile.

Modified Paths:
--------------
    branches/Cog/build.macos32x86/common/Makefile.rules
    branches/Cog/build.macos64x64/common/Makefile.rules

Modified: branches/Cog/build.macos32x86/common/Makefile.rules
===================================================================
--- branches/Cog/build.macos32x86/common/Makefile.rules	2016-05-11 18:46:28 UTC (rev 3713)
+++ branches/Cog/build.macos32x86/common/Makefile.rules	2016-05-11 18:59:18 UTC (rev 3714)
@@ -4,6 +4,7 @@
 # See http://make.mad-scientist.net/papers/advanced-auto-dependency-generation
 # for an explanation of the dependency management scheme.
 
+# /usr/bin/clang, a.k.a. /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
 CC := clang
 LD := clang
 LDCXX := clang++ # For linking c++ bundles
@@ -14,15 +15,15 @@
 ALLFLAGS = $(DEPFLAGS) $(WARNINGS) $(CFLAGS)
 POSTCOMPILE = sed '/^$$/d' <deps/$(*F).Td | sed '/^.*:$$/d' | sed 's/^build[^/]*/$$(BUILD)/' > deps/$(*F).d; rm deps/$(*F).Td; touch -r $< deps/$(*F).d
 
-$(OBJDIR)/%.o: %.c deps/%.d
+$(OBJDIR)/%.o: %.c deps/%.d $(MAKEFILE)
 	$(CC) -x c $(ALLFLAGS) $(INCLUDES) -c $< -o $@
 	$(POSTCOMPILE)
 
-$(OBJDIR)/%.o: %.m deps/%.d
+$(OBJDIR)/%.o: %.m deps/%.d $(MAKEFILE)
 	$(CC) -x objective-c $(ALLFLAGS) $(INCLUDES) -c $< -o $@
 	$(POSTCOMPILE)
 
-$(OBJDIR)/%.o: %.cpp deps/%.d
+$(OBJDIR)/%.o: %.cpp deps/%.d $(MAKEFILE)
 	$(CC) -x c++ $(ALLFLAGS) $(INCLUDES) -c $< -o $@
 	$(POSTCOMPILE)
 

Modified: branches/Cog/build.macos64x64/common/Makefile.rules
===================================================================
--- branches/Cog/build.macos64x64/common/Makefile.rules	2016-05-11 18:46:28 UTC (rev 3713)
+++ branches/Cog/build.macos64x64/common/Makefile.rules	2016-05-11 18:59:18 UTC (rev 3714)
@@ -4,13 +4,8 @@
 # See http://make.mad-scientist.net/papers/advanced-auto-dependency-generation
 # for an explanation of the dependency management scheme.
 
-XCODETOOLCHAINS := /Applications/Xcode.app/Contents/Developer/Toolchains
-XCODETOOLCHAIN := $(XCODETOOLCHAINS)/XcodeDefault.xctoolchain
-
 # /usr/bin/clang, a.k.a. /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
 CC := clang
-# convoluted, but clang -version writes to /dev/tty, /not/ stdout :-(
-CCVERSION = $(shell ls $(XCODETOOLCHAIN)/usr/lib/clang)
 LD := clang
 LDCXX := clang++ # For linking c++ bundles
 
@@ -20,15 +15,15 @@
 ALLFLAGS = $(DEPFLAGS) $(WARNINGS) $(CFLAGS)
 POSTCOMPILE = sed '/^$$/d' <deps/$(*F).Td | sed '/^.*:$$/d' | sed 's/^build[^/]*/$$(BUILD)/' > deps/$(*F).d; rm deps/$(*F).Td; touch -r $< deps/$(*F).d
 
-$(OBJDIR)/%.o: %.c deps/%.d
+$(OBJDIR)/%.o: %.c deps/%.d $(MAKEFILE)
 	$(CC) -x c $(ALLFLAGS) $(INCLUDES) -c $< -o $@
 	$(POSTCOMPILE)
 
-$(OBJDIR)/%.o: %.m deps/%.d
+$(OBJDIR)/%.o: %.m deps/%.d $(MAKEFILE)
 	$(CC) -x objective-c $(ALLFLAGS) $(INCLUDES) -c $< -o $@
 	$(POSTCOMPILE)
 
-$(OBJDIR)/%.o: %.cpp deps/%.d
+$(OBJDIR)/%.o: %.cpp deps/%.d $(MAKEFILE)
 	$(CC) -x c++ $(ALLFLAGS) $(INCLUDES) -c $< -o $@
 	$(POSTCOMPILE)