[llvm-commits] CVS: llvm/Makefile.common

[John Criswell]

Changes in directory llvm:

Makefile.common updated: 1.88.2.2 -> 1.88.2.3

---
Log message:

Added comments about the new environment variables (LLVM_SRC_DIR and friends).
Removed the use of Makefile.Linux and Makefile.SunOS.
Fixed the errors regarding invalid options to libtool for building static
libraries.


---
Diffs of the changes:

Index: llvm/Makefile.common
diff -u llvm/Makefile.common:1.88.2.2 llvm/Makefile.common:1.88.2.3
--- llvm/Makefile.common:1.88.2.2	Tue Jun 24 11:00:01 2003
+++ llvm/Makefile.common	Tue Jun 24 15:36:04 2003
@@ -30,15 +30,24 @@
 #    are in, if they are not in the current directory.  This should include a
 #    trailing / character.
 #
-# 6. PROJ_COMPILE - If set to 1, then this makefile can also be used to
-#    compile other projects using llvm. Note if this option is set then the
-#    following *must* hold
-#    PROJLEVEL should be set to the top of the source directory for the
-#               project files 
-#    LEVEL should be set to the top of LLVM source tree
-#    LLVM_LIB_DIR should be set to the top of the LLVM build tree
+# 6. LLVM_SRC_ROOT - If specified, points to the top of the LLVM source tree.
 #
-#    
+# 7. LLVM_OBJ_ROOT - If specified, points to the top directory where LLVM
+#    object files are placed.
+#
+# 8. BUILD_SRC_DIR - The directory which contains the current set of Makefiles
+#    and usually the source code too (unless SourceDir is set).
+#
+# 9. BUILD_SRC_ROOT - The root directory of the source code being compiled.
+#
+# 10. BUILD_OBJ_DIR - The directory where object code should be placed.
+#
+# 11. BUILD_OBJ_ROOT - The root directory for where object code should be
+#     placed.
+#
+# For building,
+# 	LLVM, LLVM_SRC_ROOT = BUILD_SRC_ROOT, and
+# 	LLVM_OBJ_ROOT = BUILD_OBJ_ROOT.
 #===-----------------------------------------------------------------------====
 
 # Configuration file to set paths specific to local installation of LLVM
@@ -113,12 +122,6 @@
 LLVM_OBJ_ROOT = $(BUILD_OBJ_ROOT)
 endif
 
-# Figure out how to do platform specific stuff on this platform.  This is really
-# gross and should be autoconfiscated (automake actually), but should hopefully
-# work on Linux and solaris (SunOS).
-#
-include $(LLVM_SRC_ROOT)/Makefile.$(OS)
-
 ###########################################################################
 # Default Targets:
 #	The following targets are the standard top level targets for
@@ -345,7 +348,7 @@
 #
 # Configure where the item being compiled should go.
 #
-ifdef LIBRARYNAME
+ifdef SHARED_LIBRARY
 Link := $(Link) -rpath $(DESTLIBCURRENT)
 endif
 
@@ -484,17 +487,17 @@
 $(LIBNAME_AO): $(LObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
 	@echo ======= Linking $(LIBRARYNAME) release library =======
 	@$(RM) -f $@
-	$(VERB) $(LinkO) -o $@ $(LObjectsO) $(LibSubDirs) -static
+	$(VERB) $(Link) -03 -o $@ $(LObjectsO) $(LibSubDirs) -static
 
 $(LIBNAME_AP): $(LObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir
 	@echo ======= Linking $(LIBRARYNAME) profile library =======
 	@$(RM) -f $@
-	$(VERB) $(LinkP) -o $@ $(LObjectsP) $(LibSubDirs) -static
+	$(VERB) $(Link) -03 $(PROFILE) -o $@ $(LObjectsP) $(LibSubDirs) -static
 
 $(LIBNAME_AG): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
 	@echo ======= Linking $(LIBRARYNAME) debug library =======
 	@$(RM) -f $@
-	$(VERB) $(LinkG) -o $@ $(LObjectsG) $(LibSubDirs) -static
+	$(VERB) $(Link) -g $(STRIP) -o $@ $(LObjectsG) $(LibSubDirs) -static
 
 #
 # Rules for building .o libraries.
@@ -708,6 +711,12 @@
 	$(VERB) $(RM) -f core core.[0-9][0-9]* *.o *.d *.so *~ *.flc
 	$(VERB) $(RM) -f $(LEX_OUTPUT) $(YACC_OUTPUT)
 
+distclean:: clean
+	$(VERB) $(RM) -rf $(LEVEL)/Makefile.config \
+	                  $(LEVEL)/include/Config/config.h \
+	                  $(LEVEL)/autom4te.cache \
+	                  $(LEVEL)/config.log
+
 ###########################################################################
 # C/C++ Dependencies
 #	Define variables and rules that generate header file dependencies
@@ -719,6 +728,13 @@
 #
 SourceBaseNames := $(basename $(notdir $(filter-out Debug/%, $(Source))))
 SourceDepend := $(SourceBaseNames:%=$(BUILD_OBJ_DIR)/Depend/%.d)
+
+#
+# Depend target:
+#	This allows a user to manually ask for an update in the dependencies
+#
+depend: $(SourceDepend)
+
 
 # Create dependencies for the *.cpp files...
 #$(SourceDepend): \x