X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile.common;h=5ef5fd6a7a87f1fc0358aaff30e952260f95e3b4;hb=14329b1b51909e2826cac77e609de0bd2ecb4da4;hp=c83a55d52b008992c391d16c5517e3c96a1043ce;hpb=514fc3651bb751b1e17c2bd5d19465cf6b63d9de;p=oota-llvm.git

diff --git a/Makefile.common b/Makefile.common
index c83a55d52b0..5ef5fd6a7a8 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,4 +1,4 @@
-#                                 Makefile.common
+#===-- Makefile.common - Common make rules for LLVM -------*- makefile -*--====
 #
 # This file is included by all of the LLVM makefiles.  This file defines common
 # rules to do things like compile a .cpp file or generate dependancy info.
@@ -20,6 +20,7 @@
 #    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
 all ::
@@ -39,7 +40,7 @@ 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
+PURIFY = /usr/dcs/applications/purify/bin/purify -cache-dir="$(HOME)/purifycache" -chain-length="30" -messages=all 
 
 #---------------------------------------------------------
 # Compilation options...
@@ -49,22 +50,29 @@ PURIFY = /usr/dcs/applications/purify/bin/purify -cache-dir="/home/vadve/lattner
 RunBurg  = $(BURG) $(BURG_OPTS)
 
 # Enable this for profiling support with 'gprof'
-#Prof = -pg
+ifdef ENABLE_PROFILING
+PROFILE = -pg
+else
+PROFILE =
+endif
 
 # TODO: Get rid of exceptions! : -fno-exceptions -fno-rtti
-CompileCommonOpts = $(Prof) -Wall -W  -Wwrite-strings -Wno-unused-parameter -I$(LEVEL)/include
+# -Wno-unused-parameter
+CompileCommonOpts = $(PROFILE) -Wall -W  -Wwrite-strings -Wno-unused -I$(LEVEL)/include
 
 # Compile a file, don't link...
-Compile  = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts)
+Compile  = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts) $(PROFILE)
 CompileG = $(Compile) -g  -D_DEBUG
-# Add This for DebugMalloc: -fno-defer-pop
 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) 
+ifdef ENABLE_PURIFY
+Link     = $(PURIFY) $(CXX) $(Prof) -static
+else
+Link     = LD_RUN_PATH=/usr/dcs/software/evaluation/encap/gcc-3.0.4/lib $(CXX) $(PROFILE)
+endif
 LinkG    = $(Link) -g  -L $(LEVEL)/lib/Debug
 LinkO    = $(Link) -O3 -L $(LEVEL)/lib/Release
 
@@ -89,7 +97,7 @@ MakeLib   = $(AR)
 # 
 Source  := $(ExtraSource) $(wildcard *.cpp *.c *.y *.l)
 
-Objs = $(sort $(addsuffix .o,$(basename $(Source))))
+Objs := $(sort $(addsuffix .o,$(basename $(Source))))
 ObjectsO = $(addprefix Release/,$(Objs))
 ObjectsG = $(addprefix Debug/,$(Objs))
 
@@ -118,7 +126,7 @@ 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)
+all:: $(LIBNAME_AG) ###$(LIBNAME_AO)
 dynamic:: $(LIBNAME_G)
 # TODO: Enable optimized builds
 
@@ -149,7 +157,7 @@ endif
 ifeq ($(LEVEL), .)
 
 tags:
-	etags -l c++ `find . -name '*.cpp' -o -name '*.h'`
+	etags -l c++ `find include lib tools -name '*.cpp' -o -name '*.h'`
 
 all:: tags
 
@@ -167,7 +175,7 @@ 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)
+TOOLEXENAMES := $(TOOLEXENAME_G) ###$(TOOLEXENAME_O)
 
 # USED_LIBS_OPTIONS - Compute the options line that add -llib1 -llib2, etc.
 USED_LIBS_OPTIONS = $(addprefix -l, $(USEDLIBS))
@@ -175,9 +183,9 @@ 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))
+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::
@@ -208,17 +216,17 @@ Depend/%.d: %.c Depend/.dir
 Release/%.o: %.cpp Release/.dir Depend/.dir
 	$(CompileO) $< -o $@
 
-Release/%.o: %.c Release/.dir Depend/.dir
-	$(CompileO) $< -o $@
+#Release/%.o: %.c Release/.dir Depend/.dir
+#	$(CompileOC) $< -o $@
 
 Debug/%.o: %.cpp Debug/.dir Depend/.dir
 	$(CompileG) $< -o $@
 
-Debug/%.o: %.c Debug/.dir Depend/.dir
-	$(CompileG) $< -o $@
+#Debug/%.o: %.c Debug/.dir Depend/.dir
+#	$(CompileGC) $< -o $@
 
 # Create a .cpp source file from a burg input file
-%.burm.cpp: Debug/%.burg
+%.burm.cpp: Debug/%.burg Debug/.dir
 	$(RunBurg) $< -o $@
 
 # Create a .cpp source file from a flex input file... this uses sed to cut down
@@ -229,7 +237,7 @@ Debug/%.o: %.c Debug/.dir Depend/.dir
 # Rule for building the bison parsers...
 
 %.cpp %.h : %.y
-	bison -d -p $(<:%Parser.y=%) $(basename $@).y
+	bison -v -d -p $(<:%Parser.y=%) $(basename $@).y
 	mv -f $(basename $@).tab.c $(basename $@).cpp
 	mv -f $(basename $@).tab.h $(basename $@).h