Correcting some ripple from recent cleanup
authoralibrary <alibrary@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 26 Jun 2004 10:10:57 +0000 (10:10 +0000)
committeralibrary <alibrary@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 26 Jun 2004 10:10:57 +0000 (10:10 +0000)
Makefile
build/Makefile.linux
build/module.tpl

index 16a276d..340db0d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,8 @@ else
 MUTE:=@
 endif
 
+CLEAN=$(findstring clean,$(patsubst %clean%,clean,$(MAKECMDGOALS)))
+
 #-------------------------------------------------------------------------------
 # IRST coding rule check
 
@@ -147,16 +149,9 @@ endif
        @share/alibtool mkmodule  $(patsubst %/module.mk,%,$@) > $@;
 
 #-------------------------------------------------------------------------------
-# If cleaning, do not include dependencies or module.mk files.
-
-ifeq ($(findstring $(MAKECMDGOALS), clean distclean clean-all clean-dicts \
-clean-modules clean-depend clean-objects clean-libs clean-bins \
-clean-check-all),)
-
-#-------------------------------------------------------------------------------
 # If making modules, not not include anything
 
-ifneq ($(findstring modules,$(MAKECMDGOALS)),modules)
+ifeq ($(findstring modules,$(MAKECMDGOALS)),)
 
 #-------------------------------------------------------------------------------
 # Include the modules
@@ -164,6 +159,11 @@ ifneq ($(findstring modules,$(MAKECMDGOALS)),modules)
 -include $(patsubst %,%/module.mk,$(MODULES))
 
 #-------------------------------------------------------------------------------
+# If cleaning, do not include dependencies or module.mk files.
+
+ifeq ($(CLEAN),)
+
+#-------------------------------------------------------------------------------
 # Include dependencies if not making them!
 
 ifneq ($(MAKECMDGOALS),depend)
index 5c7bc06..32139a8 100644 (file)
@@ -27,7 +27,7 @@ ifeq ($(CCMAJORV),2)
 CXXFLAGS       = $(OPT) -W -Wall -fPIC -pipe
 CXXFLAGSNO     = $(NOOPT) -W -Wall -fPIC -pipe
 else
-CXXFLAGS       = $(OPT) -W -Wall -Werror -fPIC -pipe -fmessage-length=0 -Wno-long-long -pedantic-errors -ansi
+CXXFLAGS       = $(OPT) -W -Wall -Werror -fPIC -pipe -fmessage-length=0 -Wno-long-long -pedantic-errors -ansi -Dlinux
 CXXFLAGSNO     = $(NOOPT) -W -Wall -Werror -fPIC -pipe -fmessage-length=0 -Wno-long-long -pedantic-errors -ansi
 endif
 CFLAGS        = $(OPT) -Wall -Werror -fPIC -pipe -Wno-long-long -pedantic-errors -ansi
index e688ab0..abe3fa0 100644 (file)
@@ -320,7 +320,9 @@ endif
                @(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
                @share/alibtool depend "$(@PACKAGE@DEFINE) $(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC) $<" > $@
 
-.PRECIOUS: $(MODDIRO)/%.d
+.PRECIOUS: $(patsubst %.cxx,$(MODDIRO)/%.d,$(SRCS))
+.PRECIOUS: $(patsubst %.c,$(MODDIRO)/%.d,$(CSRCS))
+.PRECIOUS: $(patsubst %.F,$(MODDIRO)/%.d,$(patsubst %.f,$(MODDIRO)/%.d,$(FSRCS)))
 
 @PACKAGE@CHECKS := $(patsubst %.cxx,@MODULE@/check/%.viol,$(SRCS))