X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile.common;h=72d9a32ed7e9bb4cc24f750be77db73b2b3ed72a;hb=7012bcd61b249c87f027d97747f51a1c86cc96d0;hp=5755ece34d9dee840ced5b328466adf78fae5df1;hpb=b19e59cb8d48c9bf49473dfed4b8a3a823f96dee;p=oota-llvm.git

diff --git a/Makefile.common b/Makefile.common
index 5755ece34d9..72d9a32ed7e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -17,7 +17,8 @@
 #
 # 3. Source - If specified, this sets the source code filenames.  If this
 #    is not set, it defaults to be all of the .cpp, .c, .y, and .l files 
-#    in the current directory.
+#    in the current directory.  Also, if you want to build files in addition
+#    to the local files, you can use the ExtraSource variable
 #
 
 # Default Rule:  Make sure it's also a :: rule
@@ -34,26 +35,24 @@ install ::
 #LibInstDir=/usrl/local/lib/xxx
 #DocInstDir=/usr/doc/xxx
 
+BURG = /home/vadve/vadve/Research/DynOpt/Burg/burg
+BURG_OPTS = -I
+
+
+PURIFY = /usr/dcs/applications/purify/bin/purify -cache-dir="/home/vadve/lattner/purifycache" -chain-length="10" -messages=all
+
 #---------------------------------------------------------
 # Compilation options...
 #---------------------------------------------------------
 
-# Add -L options to the link command lines...
-LibPathsO = -L $(LEVEL)/lib/VMCore/Release \
-            -L $(LEVEL)/lib/Assembly/Parser/Release \
-            -L $(LEVEL)/lib/Assembly/Writer/Release \
-            -L $(LEVEL)/lib/Analysis/Release \
-            -L $(LEVEL)/lib/Bytecode/Writer/Release \
-            -L $(LEVEL)/lib/Bytecode/Reader/Release \
-            -L $(LEVEL)/lib/Optimizations/Release
-
-LibPathsG = $(LibPathsO:Release=Debug)
+# Special tools used while building
+RunBurg  = $(BURG) $(BURG_OPTS)
 
 # Enable this for profiling support with 'gprof'
 #Prof = -pg
 
 # TODO: Get rid of exceptions! : -fno-exceptions -fno-rtti
-CompileCommonOpts = $(Prof) -Wall -Winline -W  -Wwrite-strings -Wno-unused -I$(LEVEL)/include
+CompileCommonOpts = $(Prof) -Wall -W  -Wwrite-strings -Wno-unused-parameter -Wno-missing-braces -I$(LEVEL)/include
 
 # Compile a file, don't link...
 Compile  = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts)
@@ -62,9 +61,12 @@ CompileG = $(Compile) -g  -D_DEBUG
 CompileO = $(Compile) -O3 -DNDEBUG -finline-functions -felide-constructors -fnonnull-objects -freg-struct-return -fshort-enums
 
 # Link final executable
+
+# To enable purify, do it here:
+###Link     = $(PURIFY) $(CXX) $(Prof) -static
 Link     = $(CXX) $(Prof) 
-LinkG    = $(Link) -g $(LibPathsG)
-LinkO    = $(Link) -O3 $(LibPathsO)
+LinkG    = $(Link) -g  -L $(LEVEL)/lib/Debug
+LinkO    = $(Link) -O3 -L $(LEVEL)/lib/Release
 
 # Create a .so file from a .cpp file...
 #MakeSO   = $(CXX) -shared $(Prof)
@@ -77,14 +79,16 @@ Depend   = $(CXX) -MM -I$(LEVEL)/include $(CPPFLAGS)
 
 # Archive a bunch of .o files into a .a file...
 AR       = ar cq 
+MakeLib   = $(AR)
 
 #----------------------------------------------------------
 
 # Source includes all of the cpp files, and objects are derived from the
 # source files...
-ifndef Source
-Source   = $(wildcard *.cpp *.c *.y *.l)
-endif
+# The local Makefile can list other Source files via ExtraSource = ...
+# 
+Source  := $(ExtraSource) $(wildcard *.cpp *.c *.y *.l)
+
 Objs = $(sort $(addsuffix .o,$(basename $(Source))))
 ObjectsO = $(addprefix Release/,$(Objs))
 ObjectsG = $(addprefix Debug/,$(Objs))
@@ -108,37 +112,115 @@ endif
 #---------------------------------------------------------
 
 ifdef LIBRARYNAME
-LIBNAME_O := Release/lib$(LIBRARYNAME).so
-LIBNAME_G := Debug/lib$(LIBRARYNAME).so
 
-all:: $(LIBNAME_G)
-#$(LIBNAME_O)
+LIBNAME_O  := $(LEVEL)/lib/Release/lib$(LIBRARYNAME).so
+LIBNAME_G  := $(LEVEL)/lib/Debug/lib$(LIBRARYNAME).so
+LIBNAME_AO := $(LEVEL)/lib/Release/lib$(LIBRARYNAME).a
+LIBNAME_AG := $(LEVEL)/lib/Debug/lib$(LIBRARYNAME).a
+
+all:: $(LIBNAME_AG)
+dynamic:: $(LIBNAME_G)
 # TODO: Enable optimized builds
 
-$(LIBNAME_O): $(ObjectsO) $(LibSubDirs) Release/.dir Depend/.dir
+$(LIBNAME_O): $(ObjectsO) $(LibSubDirs) $(LEVEL)/lib/Release/.dir Depend/.dir
 	@echo ======= Linking $(LIBRARYNAME) release library =======
 	$(MakeSOO) -o $@ $(ObjectsO) $(LibSubDirs) $(LibLinkOpts)
 
-$(LIBNAME_G): $(ObjectsG) $(LibSubDirs) Debug/.dir Depend/.dir
+$(LIBNAME_G): $(ObjectsG) $(LibSubDirs) $(LEVEL)/lib/Debug/.dir Depend/.dir
 	@echo ======= Linking $(LIBRARYNAME) debug library =======
 	$(MakeSOG) -o $@ $(ObjectsG) $(LibSubDirs) $(LibLinkOpts)
 
+$(LIBNAME_AO): $(ObjectsO) $(LibSubDirs) $(LEVEL)/lib/Release/.dir Depend/.dir
+	@echo ======= Linking $(LIBRARYNAME) release library =======
+	@rm -f $@
+	$(MakeLib) $@ $(ObjectsO) $(LibSubDirs)
+
+$(LIBNAME_AG): $(ObjectsG) $(LibSubDirs) $(LEVEL)/lib/Debug/.dir Depend/.dir
+	@echo ======= Linking $(LIBRARYNAME) debug library =======
+	@rm -f $@
+	$(MakeLib) $@ $(ObjectsG) $(LibSubDirs)
+
+endif
+
+#------------------------------------------------------------------------
+# Create a TAGS database for emacs
+#------------------------------------------------------------------------
+
+ifeq ($(LEVEL), .)
+
+tags:
+	etags -l c++ `find . -name '*.cpp' -o -name '*.h'`
+
+all:: tags
+
 endif
 
+#------------------------------------------------------------------------
+# Handle the TOOLNAME option - used when building tool executables...
+#------------------------------------------------------------------------
+#
+# The TOOLNAME option should be used with a USEDLIBS variable that tells the
+# libraries (and the order of the libs) that should be linked to the tool.
+#
+ifdef TOOLNAME
+
+# TOOLEXENAME* - These compute the output filenames to generate...
+TOOLEXENAME_G = $(LEVEL)/tools/Debug/$(TOOLNAME)
+TOOLEXENAME_O = $(LEVEL)/tools/Release/$(TOOLNAME)
+TOOLEXENAMES = $(TOOLEXENAME_G) ###$(TOOLEXENAME_O)
+
+# USED_LIBS_OPTIONS - Compute the options line that add -llib1 -llib2, etc.
+USED_LIBS_OPTIONS = $(addprefix -l, $(USEDLIBS))
+
+# USED_LIB_PATHS - Compute the path of the libraries used so that tools are
+# rebuilt if libraries change
+#
+STATICUSEDLIBS = $(addsuffix .a, $(USEDLIBS))
+USED_LIB_PATHS_G = $(addprefix $(LEVEL)/lib/Debug/lib, $(STATICUSEDLIBS))
+USED_LIB_PATHS_O = $(addprefix $(LEVEL)/lib/Release/lib, $(STATICUSEDLIBS))
+
+all::   $(TOOLEXENAMES)
+clean::
+	rm -f $(TOOLEXENAMES)
+
+$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(LEVEL)/tools/Debug/.dir
+	$(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS) $(TOOLLINKOPTS)
+
+$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(LEVEL)/tools/Release/.dir
+	$(LinkO) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS) $(TOOLLINKOPTS)
+
+endif
+
+
 
 #---------------------------------------------------------
+.PRECIOUS: Depend/.dir Debug/.dir Release/.dir
 
-# Create dependacies for the cpp files...
+# Create dependencies for the *.cpp files...
 Depend/%.d: %.cpp Depend/.dir
 	$(Depend) $< | sed 's|$*\.o *|Release/& Debug/& Depend/$(@F)|g' > $@
 
-# Create .o files in the ObjectFiles directory from the .cpp files...
+# Create dependencies for the *.c files...
+Depend/%.d: %.c Depend/.dir
+	$(Depend) $< | sed 's|$*\.o *|Release/& Debug/& Depend/$(@F)|g' > $@
+
+# Create .o files in the ObjectFiles directory from the .cpp and .c files...
 Release/%.o: %.cpp Release/.dir Depend/.dir
 	$(CompileO) $< -o $@
 
+Release/%.o: %.c Release/.dir Depend/.dir
+	$(CompileO) $< -o $@
+
 Debug/%.o: %.cpp Debug/.dir Depend/.dir
 	$(CompileG) $< -o $@
 
+Debug/%.o: %.c Debug/.dir Depend/.dir
+	$(CompileG) $< -o $@
+
+# Create a .cpp source file from a burg input file
+%.burm.cpp: Debug/%.burg
+	$(RunBurg) $< -o $@
+
 # Create a .cpp source file from a flex input file... this uses sed to cut down
 # on the warnings emited by GCC...
 %.cpp: %.l