[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1258
Date       : Tue Jun  6 12:14:51 BST 2006

Changed paths:
   M /Trunk/XaraLX/Makefile.am
   M /Trunk/XaraLX/PreComp/Makefile.am

Fix Makefiles to use $(MAKE) and removed unnecessary line in resources target


Diff:
Index: Trunk/XaraLX/PreComp/Makefile.am
===================================================================
--- Trunk/XaraLX/PreComp/Makefile.am	(revision 1257)
+++ Trunk/XaraLX/PreComp/Makefile.am	(revision 1258)
@@ -1,22 +1,23 @@
-BUILT_SOURCES	= camtypes.h.gch
-CLEANFILES		= camtypes.h.gch
-
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(XARAFLAGS)
-
-include ./$(DEPDIR)/camtypes.h.Po
-
-$(DEPDIR)/camtypes.h.Po:
-	if test ! -d "$(DEPDIR)"; then mkdir $(DEPDIR); fi
-	touch $(DEPDIR)/camtypes.h.Po
-
-camtypes.h.gch: camtypes.h
-	if $(CXXCOMPILE) -x c++-header -MT $@ -MD -MP -MF "$(DEPDIR)/camtypes.h.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/camtypes.h.Tpo" "$(DEPDIR)/camtypes.h.Po"; else rm -f "$(DEPDIR)/camtypes.h.Tpo"; exit 1; fi
-	make -C ../Kernel clean
-	make -C ../wxXtra clean
-	make -C ../tools clean
-	make -C ../wxOil clean
-	
-
-
+BUILT_SOURCES	= camtypes.h.gch
+CLEANFILES		= camtypes.h.gch
+
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(XARAFLAGS)
+
+include ./$(DEPDIR)/camtypes.h.Po
+
+$(DEPDIR)/camtypes.h.Po:
+	if test ! -d "$(DEPDIR)"; then mkdir $(DEPDIR); fi
+	touch $(DEPDIR)/camtypes.h.Po
+
+camtypes.h.gch: camtypes.h
+	if $(CXXCOMPILE) -x c++-header -MT $@ -MD -MP -MF "$(DEPDIR)/camtypes.h.Tpo" -c -o $@ $<; \
+	then mv -f "$(DEPDIR)/camtypes.h.Tpo" "$(DEPDIR)/camtypes.h.Po"; else rm -f "$(DEPDIR)/camtypes.h.Tpo"; exit 1; fi;
+	$(MAKE) -C ../Kernel clean
+	$(MAKE) -C ../wxXtra clean
+	$(MAKE) -C ../tools clean
+	$(MAKE) -C ../wxOil clean 
+
+	
+
+
Index: Trunk/XaraLX/Makefile.am
===================================================================
--- Trunk/XaraLX/Makefile.am	(revision 1257)
+++ Trunk/XaraLX/Makefile.am	(revision 1258)
@@ -81,7 +81,6 @@
 release: all
 
 resources:
-	@make -CwxOil xrc/resources.xrs ; \
 	( rm -rf Resources ; mkdir -p Resources ; cd Resources ; $(UNZIP) -q ../wxOil/xrc/resources.xrs )
 
 ACLOCAL_AMFLAGS = -I m4


Xara