diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-12-18 22:28:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:47:30 -0500 |
| commit | 49b10f4defb67ec2c207cd8766d307e0f4666756 (patch) | |
| tree | 74c4efcccb4cfd47656888f0b2cd1acaa9705ad3 | |
| parent | ddbeaa2f65933a74526ec49aa074c9b662d8beb1 (diff) | |
| download | samba-49b10f4defb67ec2c207cd8766d307e0f4666756.tar.gz samba-49b10f4defb67ec2c207cd8766d307e0f4666756.tar.bz2 samba-49b10f4defb67ec2c207cd8766d307e0f4666756.zip | |
r12325: - remove the hostcc object files with make clean
- move the .SUFFIXES statement before the suffix rules
this fixes the build with bsd make
metze
(This used to be commit 11da32df31db8cd0836bf66ce2650cb1c43c24c5)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 1 | ||||
| -rw-r--r-- | source4/main.mk | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 6982e28977..6aa3e02e5c 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -38,6 +38,7 @@ sub new($$$) $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"); diff --git a/source4/main.mk b/source4/main.mk index 9c06134f29..61ea36eaa3 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -218,6 +218,8 @@ clean: heimdal_clean @-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 @@ bin/.dummy: # 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) $< |