X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile.rules;h=c897ac1e47e864e9b1a00ce22d9ec96955230256;hb=6e64ef40084a52e0f3d8e56c42a04f5de4c86fe4;hp=b28b4997f6118263bf135e95bfcc939cf13273fd;hpb=009505452b713ed2e3a8e99c5545a6e721c65495;p=oota-llvm.git

diff --git a/Makefile.rules b/Makefile.rules
index b28b4997f61..c897ac1e47e 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -20,7 +20,7 @@
 #    in the current directory.
 #
 
-# Default Rule:
+# Default Rule:  Make sure it's also a :: rule
 all ::
 
 # Default for install is to at least build everything...
@@ -34,20 +34,15 @@ install ::
 #LibInstDir=/usrl/local/lib/xxx
 #DocInstDir=/usr/doc/xxx
 
+BURG = /home/vadve/vadve/Research/DynOpt/Burg/burg
+BURG_OPTS = -I
+
 #---------------------------------------------------------
 # 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
@@ -63,8 +58,8 @@ CompileO = $(Compile) -O3 -DNDEBUG -finline-functions -felide-constructors -fnon
 
 # Link final executable
 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,6 +72,7 @@ Depend   = $(CXX) -MM -I$(LEVEL)/include $(CPPFLAGS)
 
 # Archive a bunch of .o files into a .a file...
 AR       = ar cq 
+MakeLib   = $(AR)
 
 #----------------------------------------------------------
 
@@ -85,6 +81,7 @@ AR       = ar cq
 ifndef Source
 Source   = $(wildcard *.cpp *.c *.y *.l)
 endif
+
 Objs = $(sort $(addsuffix .o,$(basename $(Source))))
 ObjectsO = $(addprefix Release/,$(Objs))
 ObjectsG = $(addprefix Debug/,$(Objs))
@@ -108,37 +105,101 @@ 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
+$(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
+$(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
 
+#------------------------------------------------------------------------
+# 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
+
+
 
 #---------------------------------------------------------
 
-# 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: %.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