From 03b5529ab45c99b5316d95a74390de55749fcd7b Mon Sep 17 00:00:00 2001 From: Joerg Mayer Date: Fri, 2 Apr 1999 10:33:21 +0000 Subject: [PATCH] - Remove some old rc make stuff - "make clean" omitted some include subdirs --- Make.rules.in | 18 +----------------- Makefile.in | 2 +- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index e1019487487..9b9bc7ae43d 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -99,22 +99,6 @@ OBJS = $(C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) $(ASM_SRCS:.S=.o) \ .res.h: $(WRC) $(WRCFLAGS) $(WRCEXTRA) -bnh $< -# Obsolete -#.rc.c: -# echo "#include \"windows.h\"" >$*-tmp.c -# echo WINDOWS_H_ENDS_HERE >>$*-tmp.c -# cat $< >>$*-tmp.c -# $(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P $*-tmp.c | sed -e '1,/^WINDOWS_H_ENDS_HERE/d' | $(WINERC) $(RCFLAGS) -c -o $* -p $* -# $(RM) $*-tmp.c -# -#.rc.h: -# echo "#include \"windows.h\"" >$*-tmp.c -# echo WINDOWS_H_ENDS_HERE >>$*-tmp.c -# cat $< >>$*-tmp.c -# $(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P $*-tmp.c | sed -e '1,/^WINDOWS_H_ENDS_HERE/d' | $(WINERC) $(RCFLAGS) -c -o $* -p $* -# $(RM) $*-tmp.c -# - # Rule to rebuild the resource compiler @@ -166,7 +150,7 @@ depend:: $(MAKEDEP) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS) $(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS) clean:: - $(RM) *.o \#*\# *~ *% .#* *.bak *.orig *.rej *.flc *-tmp.c y.tab.c y.tab.h lex.yy.c core $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.s) $(RC_SRCS:.rc=.h) $(PROGRAMS) + $(RM) *.o \#*\# *~ *% .#* *.bak *.orig *.rej *.flc y.tab.c y.tab.h lex.yy.c core $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.s) $(RC_SRCS:.rc=.h) $(PROGRAMS) dummy: diff --git a/Makefile.in b/Makefile.in index d1a00e49079..d6984f66a7d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -234,7 +234,7 @@ htmlpages: clean:: for i in $(BUILDSUBDIRS); do (cd $$i; $(MAKE) clean) || exit 1; done - for i in include include/wine; do (cd $$i; $(RM) *.o \#*\# .#* *~ *% *.bak *.orig *.rej *.flc); done + for i in include include/bitmaps include/server include/wine; do (cd $$i; $(RM) *.o \#*\# .#* *~ *% *.bak *.orig *.rej *.flc); done $(RM) wine wine.sym libwine.a libwine.so.1.0 libwine.so TAGS .#* distclean: clean