svn commit: samba r12325 - in branches/SAMBA_4_0/source: . build/smb_build

[metze at samba.org]

Author: metze
Date: 2005-12-18 22:28:41 +0000 (Sun, 18 Dec 2005)
New Revision: 12325

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12325

Log:
- remove the hostcc object files with make clean
- move the .SUFFIXES statement before the suffix rules
  this fixes the build with bsd make

metze

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/main.mk


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-12-18 22:28:12 UTC (rev 12324)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-12-18 22:28:41 UTC (rev 12325)
@@ -38,6 +38,7 @@
 
 	$self->_prepare_path_vars();
 	$self->_prepare_compiler_linker();
+	$self->output(".SUFFIXES: .x .c .et .y .l .d .o .h .h.gch .a .so .1 .1.xml .3 .3.xml .5 .5.xml .7 .7.xml .ho\n");
 	$self->_prepare_hostcc_rule();
 	$self->_prepare_std_CC_rule("c","o",'$(PICFLAG)',"Compiling","Rule for std objectfiles");
 	$self->_prepare_std_CC_rule("h","h.gch",'$(PICFLAG)',"Precompiling","Rule for precompiled headerfiles");

Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2005-12-18 22:28:12 UTC (rev 12324)
+++ branches/SAMBA_4_0/source/main.mk	2005-12-18 22:28:41 UTC (rev 12325)
@@ -218,6 +218,8 @@
 	@-rm -f include/proto.h
 	@echo Removing objects
 	@-find . -name '*.o' -exec rm -f '{}' \;
+	@echo Removing hostcc objects
+	@-find . -name '*.ho' -exec rm -f '{}' \;
 	@echo Removing binaries
 	@-rm -f $(BIN_PROGS) $(SBIN_PROGS)
 	@echo Removing libraries
@@ -268,8 +270,6 @@
 # File types
 ###############################################################################
 
-.SUFFIXES: .x .c .et .y .l .d .o .h .h.gch .a .so .1 .1.xml .3 .3.xml .5 .5.xml .7 .7.xml .ho
-
 .c.d:
 	@echo "Generating dependencies for $<"
 	@$(CC) -MM -MG -MT $(<:.c=.o) -MF $@ $(CFLAGS) $<