Simplify and correct rules for building lex/yacc files. Make sure to delete

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index 7518f7ff6e9ebd25ef11deb5c13e491df2e81bca..43048f7eb7b451549d9859c3f6785bea5af7b02c 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -144,7 +144,7 @@ ifdef KEEP_SYMBOLS
 STRIP =
 WARN_MSG =
 else
-STRIP = -s
+STRIP = -Wl,-x
 WARN_MSG = "(without symbols) "
 endif
 
@@ -174,9 +174,9 @@ Link     := $(PURIFY) $(CXX) -static
 else
 Link     := $(CXX)
 endif
-LinkG    := $(Link) -g  -L $(LIBDEBUG) $(STRIP)
-LinkO    := $(Link) -O3 -L $(LIBRELEASE)
-LinkP    := $(Link) -O3 -L $(LIBPROFILE) $(PROFILE)
+LinkG    := $(Link) -g  -L$(LIBDEBUG) $(STRIP)
+LinkO    := $(Link) -O3 -L$(LIBRELEASE)
+LinkP    := $(Link) -O3 -L$(LIBPROFILE) $(PROFILE)
 
 # Create one .o file from a bunch of .o files...
 Relink = ld -r
@@ -215,7 +215,7 @@ ObjectsG := $(addprefix $(BUILD_ROOT)/Debug/,$(Objs))
 #---------------------------------------------------------
 
 ifdef DIRS
-all install clean ::
+all install clean test ::
        $(VERB) for dir in ${DIRS}; do \
                (cd $$dir; $(MAKE) $@) || exit 1; \
        done
@@ -226,8 +226,9 @@ ifdef PARALLEL_DIRS
 all     :: $(addsuffix /.makeall    , $(PARALLEL_DIRS))
 install :: $(addsuffix /.makeinstall, $(PARALLEL_DIRS))
 clean   :: $(addsuffix /.makeclean  , $(PARALLEL_DIRS))
+test    :: $(addsuffix /.maketest   , $(PARALLEL_DIRS))
 
-%/.makeall %/.makeinstall %/.makeclean:
+%/.makeall %/.makeinstall %/.makeclean %/.maketest:
        $(VERB) cd $(@D); $(MAKE) $(subst $(@D)/.make,,$@)
 
 endif
@@ -393,6 +394,7 @@ STATICUSEDLIBS   := $(patsubst %.a.o, lib%.a, $(addsuffix .o, $(USEDLIBS)))
 USED_LIB_PATHS_G := $(addprefix $(LIBDEBUG)/, $(STATICUSEDLIBS))
 USED_LIB_PATHS_O := $(addprefix $(LIBRELEASE)/, $(STATICUSEDLIBS))
 USED_LIB_PATHS_P := $(addprefix $(LIBPROFILE)/, $(STATICUSEDLIBS))
+LINK_OPTS        := $(TOOLLINKOPTS) $(PLATFORMLINKOPTS)
 
 all::   $(TOOLEXENAMES)
 clean::
@@ -400,15 +402,15 @@ clean::
 
 $(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(BUILD_ROOT_TOP)/tools/Debug/.dir
        @echo ======= Linking $(TOOLNAME) debug executable $(WARN_MSG) =======
-       $(VERB) $(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS_G) $(TOOLLINKOPTS)
+       $(VERB) $(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS_G) $(LINK_OPTS)
 
 $(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(BUILD_ROOT_TOP)/tools/Release/.dir
        @echo ======= Linking $(TOOLNAME) release executable =======
-       $(VERB) $(LinkO) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS_O) $(TOOLLINKOPTS)
+       $(VERB) $(LinkO) -o $@ $(ObjectsO) $(USED_LIBS_OPTIONS_O) $(LINK_OPTS)
 
 $(TOOLEXENAME_P): $(ObjectsP) $(USED_LIB_PATHS_P) $(BUILD_ROOT_TOP)/tools/Profile/.dir
        @echo ======= Linking $(TOOLNAME) profile executable =======
-       $(VERB) $(LinkP) -o $@ $(ObjectsP) $(USED_LIBS_OPTIONS_P) $(TOOLLINKOPTS)
+       $(VERB) $(LinkP) -o $@ $(ObjectsP) $(USED_LIBS_OPTIONS_P) $(LINK_OPTS)
 
 endif
 
@@ -449,6 +451,15 @@ $(BUILD_ROOT)/Debug/%.o: %.cpp $(BUILD_ROOT)/Debug/.dir
 $(BUILD_ROOT)/Debug/%.o: %.c $(BUILD_ROOT)/Debug/.dir 
        $(VERB) $(CompileCG) $< -o $@
 
+#
+# Rules for building lex/yacc files
+#
+LEX_FILES   = $(filter %.l, $(Source))
+LEX_OUTPUT  = $(LEX_FILES:%.l=%.cpp)
+YACC_FILES  = $(filter %.y, $(Source))
+YACC_OUTPUT = $(addprefix $(YACC_FILES:%.y=%), .h .cpp .output)
+.PRECIOUS: $(LEX_OUTPUT) $(YACC_OUTPUT)
+
 # Create a .cpp source file from a flex input file... this uses sed to cut down
 # on the warnings emited by GCC...
 %.cpp: %.l
@@ -457,24 +468,29 @@ $(BUILD_ROOT)/Debug/%.o: %.c $(BUILD_ROOT)/Debug/.dir
 # Rule for building the bison parsers...
 
 %.cpp %.h : %.y
-       $(VERB) $(BISON) -v -d -p $(<:%Parser.y=%) $(basename $@).y
-       $(VERB) mv -f $(basename $@).tab.c $(basename $@).cpp
-       $(VERB) mv -f $(basename $@).tab.h $(basename $@).h
+       $(VERB) $(BISON) -v -d -p $(<:%Parser.y=%) $*.y
+       $(VERB) mv -f $*.tab.c $*.cpp
+       $(VERB) mv -f $*.tab.h $*.h
 
 # To create the directories...
 %/.dir:
-       $(VERB) mkdir -p $(@D)
+       $(VERB) mkdir -p $*
        @date > $@
 
+# To create postscript files from dot files...
+%.ps: %.dot
+       dot -Tps < $< > $@
+
 # 'make clean' nukes the tree
 clean::
        $(VERB) rm -rf $(BUILD_ROOT)/Debug $(BUILD_ROOT)/Release $(BUILD_ROOT)/Profile $(BUILD_ROOT)/Depend
-       $(VERB) rm -f core *.o *.d *.so *~ *.flc
+       $(VERB) rm -f core core.[0-9][0-9]* *.o *.d *.so *~ *.flc
+       $(VERB) rm -f $(LEX_OUTPUT) $(YACC_OUTPUT)
 
 # If dependancies were generated for the file that included this file,
 # include the dependancies now...
 #
 SourceDepend := $(addsuffix .d,$(addprefix $(BUILD_ROOT)/Depend/,$(basename $(filter-out Debug/%, $(Source)))))
 ifneq ($(SourceDepend),)
-include $(SourceDepend)
+-include $(SourceDepend)
 endif