[llvm-commits] CVS: llvm/Makefile.common
John Criswell
criswell at choi.cs.uiuc.edu
Mon Jun 23 14:12:02 PDT 2003
Changes in directory llvm:
Makefile.common updated: 1.88 -> 1.88.2.1
---
Log message:
Initial autoconf checkin.
Uses a modified version of libtool for building files.
---
Diffs of the changes:
Index: llvm/Makefile.common
diff -u llvm/Makefile.common:1.88 llvm/Makefile.common:1.88.2.1
--- llvm/Makefile.common:1.88 Wed Jun 11 08:55:26 2003
+++ llvm/Makefile.common Mon Jun 23 14:11:41 2003
@@ -117,8 +117,13 @@
# gross and should be autoconfiscated (automake actually), but should hopefully
# work on Linux and solaris (SunOS).
#
-UNAME := $(shell uname)
-include $(LLVM_SRC_ROOT)/Makefile.$(UNAME)
+include $(LLVM_SRC_ROOT)/Makefile.$(OS)
+
+###########################################################################
+# Default Targets:
+# The following targets are the standard top level targets for
+# building.
+###########################################################################
ifdef SHARED_LIBRARY
# if SHARED_LIBRARY is specified, the default is to build the dynamic lib
@@ -134,6 +139,12 @@
# Default rule for test. It ensures everything has a test rule
test::
+###########################################################################
+# Miscellaneous paths and commands:
+# This section defines various configuration macros, such as where
+# to find burg, tblgen, and libtool.
+###########################################################################
+
#--------------------------------------------------------------------
# Variables derived from configuration options...
#--------------------------------------------------------------------
@@ -157,8 +168,21 @@
endif
endif
+#
+# Enable this for profiling support with 'gprof'
+# This automatically enables optimized builds.
+#
+ifdef ENABLE_PROFILING
+ PROFILE = -pg
+endif
+
+#
+# Suffixes for library compilation rules
+#
+.SUFFIXES: .so
+
###########################################################################
-# Library Locations
+# Library Locations:
# These variables describe various library locations:
#
# DEST* = Location of where libraries that are built will be placed.
@@ -208,36 +232,45 @@
PROJTOOLPROFILE := $(BUILD_OBJ_ROOT)/tools/Profile
PROJTOOLCURRENT := $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION)
+#
+# Libtool is found in the current directory.
+#
+ifdef VERBOSE
+LIBTOOL=$(LLVM_SRC_ROOT)/libtool
+else
+LIBTOOL=$(LLVM_SRC_ROOT)/libtool --silent
+endif
+
+#
# Verbosity levels
+#
ifndef VERBOSE
VERB := @
endif
-#---------------------------------------------------------
-# Compilation options...
-#---------------------------------------------------------
-
###########################################################################
-# Special tools used while building the LLVM tree. Burg is built as part of the
-# utils directory.
+# Miscellaneous paths and commands (part deux):
+# This section defines various configuration macros, such as where
+# to find burg, tblgen, and libtool.
###########################################################################
+
+#--------------------------------------------------------------------------
+# Special tools used while building the LLVM tree. Burg is built as part
+# of the utils directory.
+#--------------------------------------------------------------------------
BURG := $(LLVMTOOLCURRENT)/burg
RunBurg := $(BURG) $(BURG_OPTS)
TBLGEN := $(LLVMTOOLCURRENT)/tblgen
-# Enable this for profiling support with 'gprof'
-# This automatically enables optimized builds.
-ifdef ENABLE_PROFILING
- PROFILE = -pg
-endif
###########################################################################
# Compile Time Flags
###########################################################################
#
-# Include both the project headers and the LLVM headers for compilation
+# Include both the project headers and the LLVM headers for compilation and
+# dependency computation.
#
CPPFLAGS += -I$(BUILD_SRC_ROOT)/include -I$(LLVM_SRC_ROOT)/include
@@ -254,47 +287,71 @@
CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused -I$(LEVEL)/include
CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions -fshort-enums
+#
+# Compile commands with libtool.
+#
+Compile := $(LIBTOOL) --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts)
+CompileC := $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CompileCommonOpts)
+
+#
+# Add the LLVM specific "-only-static" option so that we only compile .o files
+# once when not building a shared library.
+#
+# For shared libraries, we will end up building twice, but that doesn't happen
+# very often, so we'll let it go.
+#
+ifndef SHARED_LIBRARY
+Compile := $(Compile) -only-static
+CompileC := $(CompileC) -only-static
+endif
+
# Compile a cpp file, don't link...
-Compile := $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts)
CompileG := $(Compile) -g -D_DEBUG
CompileO := $(Compile) $(CompileOptimizeOpts) -felide-constructors -fomit-frame-pointer
CompileP := $(Compile) $(CompileOptimizeOpts) -felide-constructors $(PROFILE)
# Compile a c file, don't link...
-CompileC := $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CompileCommonOpts)
CompileCG := $(CompileC) -g -D_DEBUG
CompileCO := $(CompileC) $(CompileOptimizeOpts) -fomit-frame-pointer
CompileCP := $(CompileC) $(CompileOptimizeOpts) $(PROFILE)
+###########################################################################
+# Link Time Options
+###########################################################################
+#
# Link final executable
-
+# (Note that we always link with the C++ compiler).
+#
ifdef ENABLE_PURIFY # To enable purify, build with 'gmake ENABLE_PURIFY=1'
-Link := $(PURIFY) $(CXX) -static
+Link := $(PURIFY) $(LIBTOOL) --mode=link $(CXX) -static
else
-Link := $(CXX)
+Link := $(LIBTOOL) --mode=link $(CXX)
endif
-ifdef PROJ_COMPILE
-# include both projlib source and llvmlib source
+# link both projlib and llvmlib libraries
LinkG := $(Link) -g -L$(PROJLIBDEBUGSOURCE) -L$(LLVMLIBDEBUGSOURCE) $(STRIP)
LinkO := $(Link) -O3 -L$(PROJLIBRELEASESOURCE) -L$(LLVMLIBRELEASESOURCE)
LinkP := $(Link) -O3 -L$(PROJLIBPROFILESOURCE) -L$(LLVMLIBPROFILESOURCE) $(PROFILE)
-else
-LinkG := $(Link) -g -L$(LLVMLIBDEBUGSOURCE) $(STRIP)
-LinkO := $(Link) -O3 -L$(LLVMLIBRELEASESOURCE)
-LinkP := $(Link) -O3 -L$(LLVMLIBPROFILESOURCE) $(PROFILE)
-endif
-
-
# Create one .o file from a bunch of .o files...
-Relink = ${LD} -r
+Relink = ${LIBTOOL} --mode=link $(CXX)
# MakeSO - Create a .so file from a .o files...
-MakeSO := $(CXX) $(MakeSharedObjectOption)
-MakeSOO := $(MakeSO) -O3
-MakeSOP := $(MakeSOO) $(PROFILE)
+#MakeSO := $(LIBTOOL) --mode=link $(CXX) $(MakeSharedObjectOption)
+#MakeSOO := $(MakeSO) -O3
+#MakeSOP := $(MakeSOO) $(PROFILE)
+
+#
+# Configure where the item being compiled should go.
+#
+ifdef LIBRARYNAME
+Link := $(Link) -rpath $(DESTLIBCURRENT)
+endif
+
+ifdef TOOLNAME
+Link := $(Link) -rpath $(DESTTOOLCURRENT)
+endif
# Create dependancy file from CPP file, send to stdout.
Depend := $(CXX) -MM -I$(LEVEL)/include $(CPPFLAGS)
@@ -318,6 +375,10 @@
ObjectsP := $(addprefix $(BUILD_OBJ_DIR)/Profile/,$(Objs))
ObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(Objs))
+LObjs := $(sort $(patsubst Debug/%.lo, %.lo, $(addsuffix .lo,$(notdir $(basename $(Source))))))
+LObjectsO := $(addprefix $(BUILD_OBJ_DIR)/Release/,$(LObjs))
+LObjectsP := $(addprefix $(BUILD_OBJ_DIR)/Profile/,$(LObjs))
+LObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(LObjs))
#---------------------------------------------------------
# Handle the DIRS and PARALLEL_DIRS options
@@ -341,6 +402,9 @@
$(VERB) cd $(@D); $(MAKE) $(subst $(@D)/.make,,$@)
endif
+###########################################################################
+# Library Build Rules:
+#
#---------------------------------------------------------
# Handle the LIBRARYNAME option - used when building libs...
#---------------------------------------------------------
@@ -357,6 +421,7 @@
# it's built as a .o file, then all of the constituent .o files in it will be
# linked into tools (for example gccas) even if they only use one of the parts
# of it. For this reason, sometimes it's useful to use libraries as .a files.
+###########################################################################
ifdef LIBRARYNAME
@@ -373,6 +438,11 @@
LIBNAME_OBJP := $(DESTLIBPROFILE)/$(LIBRARYNAME).o
LIBNAME_OBJG := $(DESTLIBDEBUG)/$(LIBRARYNAME).o
+#--------------------------------------------------------------------
+# Library Targets
+# Modify the top level targets to build the desired libraries.
+#--------------------------------------------------------------------
+
# dynamic target builds a shared object version of the library...
dynamic:: $(DESTLIBCURRENT)/lib$(LIBRARYNAME).so
@@ -386,33 +456,49 @@
all:: $(DESTLIBCURRENT)/lib$(LIBRARYNAME).a
endif
-$(LIBNAME_O): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
+#--------------------------------------------------------------------
+# Rules for building libraries
+#--------------------------------------------------------------------
+
+#
+# Rules for building dynamically linked libraries.
+#
+$(LIBNAME_O): $(LObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
@echo ======= Linking $(LIBRARYNAME) release library =======
- $(VERB) $(MakeSOO) -o $@ $(ObjectsO) $(LibSubDirs) $(LibLinkOpts)
+ $(VERB) $(Link) -o $*.la $(LObjectsO) $(LibSubDirs) $(LibLinkOpts); \
+ $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT);
-$(LIBNAME_P): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir
+$(LIBNAME_P): $(LObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir
@echo ======= Linking $(LIBRARYNAME) profile library =======
- $(VERB) $(MakeSOP) -o $@ $(ObjectsP) $(LibSubDirs) $(LibLinkOpts)
+ $(VERB) $(Link) -o $*.la $(LObjectsP) $(LibSubDirs) $(LibLinkOpts); \
+ $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT);
-$(LIBNAME_G): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
+$(LIBNAME_G): $(LObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
@echo ======= Linking $(LIBRARYNAME) debug library =======
- $(VERB) $(MakeSO) -g -o $@ $(ObjectsG) $(LibSubDirs) $(LibLinkOpts)
+ $(VERB) $(Link) -o $*.la $(LObjectsG) $(LibSubDirs) $(LibLinkOpts); \
+ $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT);
-$(LIBNAME_AO): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
+#
+# Rules for building static archive libraries.
+#
+$(LIBNAME_AO): $(LObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
@echo ======= Linking $(LIBRARYNAME) release library =======
- @rm -f $@
- $(VERB) $(AR) $@ $(ObjectsO) $(LibSubDirs)
+ @$(RM) -f $@
+ $(VERB) $(LinkO) -o $@ $(LObjectsO) $(LibSubDirs) -static
-$(LIBNAME_AP): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir
+$(LIBNAME_AP): $(LObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir
@echo ======= Linking $(LIBRARYNAME) profile library =======
- @rm -f $@
- $(VERB) $(AR) $@ $(ObjectsP) $(LibSubDirs)
+ @$(RM) -f $@
+ $(VERB) $(LinkP) -o $@ $(LObjectsP) $(LibSubDirs) -static
$(LIBNAME_AG): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
@echo ======= Linking $(LIBRARYNAME) debug library =======
- @rm -f $@
- $(VERB) $(AR) $@ $(ObjectsG) $(LibSubDirs)
+ @$(RM) -f $@
+ $(VERB) $(LinkG) -o $@ $(LObjectsG) $(LibSubDirs) -static
+#
+# Rules for building .o libraries.
+#
$(LIBNAME_OBJO): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
@echo "Linking $@"
$(VERB) $(Relink) -o $@ $(ObjectsO) $(LibSubDirs)
@@ -431,11 +517,16 @@
# Create a TAGS database for emacs
#------------------------------------------------------------------------
+ifdef ETAGS
ifeq ($(LEVEL), .)
tags:
- etags -l c++ `find include lib tools -name '*.cpp' -o -name '*.h'`
+ $(ETAGS) -l c++ `find include lib tools -name '*.cpp' -o -name '*.h'`
all:: tags
endif
+else
+tags:
+ ${ECHO} "Cannot build $@: The program etags is not installed"
+endif
#------------------------------------------------------------------------
# Handle the TOOLNAME option - used when building tool executables...
@@ -477,8 +568,14 @@
USED_LIB_PATHS_G := $(addprefix $(DESTLIBDEBUG)/, $(STATICUSEDLIBS))
USED_LIB_PATHS_O := $(addprefix $(DESTLIBRELEASE)/, $(STATICUSEDLIBS))
USED_LIB_PATHS_P := $(addprefix $(DESTLIBPROFILE)/, $(STATICUSEDLIBS))
-LINK_OPTS := $(TOOLLINKOPTS) $(PLATFORMLINKOPTS)
+#LINK_OPTS := $(TOOLLINKOPTS) $(PLATFORMLINKOPTS)
+#
+# Libtool link options:
+# Ensure that all binaries have their symbols exported so that they can
+# by dlsym'ed.
+#
+LINK_OPTS := -export-dynamic $(TOOLLINKOPTS)
@@ -491,19 +588,19 @@
all:: $(TOOLEXENAMES)
clean::
- $(VERB) rm -f $(TOOLEXENAMES)
+ $(VERB) $(RM) -f $(TOOLEXENAMES)
$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(DESTTOOLDEBUG)/.dir
@echo ======= Linking $(TOOLNAME) debug executable $(STRIP_WARN_MSG)=======
- $(VERB) $(LinkG) -o $@ $(ObjectsG) $(LIB_OPTS_G) $(LINK_OPTS)
+ $(VERB) $(LinkG) -o $@ $(ObjectsG) $(LIB_OPTS_G) $(LINK_OPTS) $(LIBS)
$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(DESTTOOLRELEASE)/.dir
@echo ======= Linking $(TOOLNAME) release executable =======
- $(VERB) $(LinkO) -o $@ $(ObjectsO) $(LIB_OPTS_O) $(LINK_OPTS)
+ $(VERB) $(LinkO) -o $@ $(ObjectsO) $(LIB_OPTS_O) $(LINK_OPTS) $(LIBS)
$(TOOLEXENAME_P): $(ObjectsP) $(USED_LIB_PATHS_P) $(DESTTOOLPROFILE)/.dir
@echo ======= Linking $(TOOLNAME) profile executable =======
- $(VERB) $(LinkP) -o $@ $(ObjectsP) $(LIB_OPTS_P) $(LINK_OPTS)
+ $(VERB) $(LinkP) -o $@ $(ObjectsP) $(LIB_OPTS_P) $(LINK_OPTS) $(LIBS)
endif
@@ -536,6 +633,29 @@
$(BUILD_OBJ_DIR)/Debug/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Debug/.dir
$(VERB) $(CompileCG) $< -o $@
+# Create .lo files in the ObjectFiles directory from the .cpp and .c files...
+$(BUILD_OBlJ_DIR)/Release/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Release/.dir
+ @echo "Compiling $<"
+ $(VERB) $(CompileO) $< -o $@
+
+$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Release/.dir
+ $(VERB) $(CompileCO) $< -o $@
+
+$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Profile/.dir
+ @echo "Compiling $<"
+ $(VERB) $(CompileP) $< -o $@
+
+$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Profile/.dir
+ @echo "Compiling $<"
+ $(VERB) $(CompileCP) $< -o $@
+
+$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Debug/.dir
+ @echo "Compiling $<"
+ $(VERB) $(CompileG) $< -o $@
+
+$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Debug/.dir
+ $(VERB) $(CompileCG) $< -o $@
+
#
# Rules for building lex/yacc files
#
@@ -554,10 +674,10 @@
# FIXME. (f.e. char Buffer[10000]; )
#
%.cpp: %.l
- $(FLEX) -t $< | sed '/^find_rule/d' | \
- sed 's/void yyunput/inline void yyunput/' | \
- sed 's/void \*yy_flex_realloc/inline void *yy_flex_realloc/' | \
- sed 's/#define YY_BUF_SIZE 16384/#define YY_BUF_SIZE (16384*64)/' > $@
+ $(FLEX) -t $< | $(SED) '/^find_rule/d' | \
+ $(SED) 's/void yyunput/inline void yyunput/' | \
+ $(SED) 's/void \*yy_flex_realloc/inline void *yy_flex_realloc/' | \
+ $(SED) 's/#define YY_BUF_SIZE 16384/#define YY_BUF_SIZE (16384*64)/' > $@
# Rule for building the bison parsers...
%.c: %.y # Cancel built-in rules for yacc
@@ -565,23 +685,28 @@
%.cpp %.h : %.y
@echo Bison\'ing $<...
$(VERB) $(BISON) -v -d -p $(<:%Parser.y=%) $*.y
- $(VERB) mv -f $*.tab.c $*.cpp
- $(VERB) mv -f $*.tab.h $*.h
+ $(VERB) ${MV} -f $*.tab.c $*.cpp
+ $(VERB) ${MV} -f $*.tab.h $*.h
# To create the directories...
%/.dir:
- $(VERB) mkdir -p $*
- @date > $@
+ $(VERB) ${MKDIR} $*
+ @$(DATE) > $@
# To create postscript files from dot files...
+ifdef DOT
%.ps: %.dot
- dot -Tps < $< > $@
+ ${DOT} -Tps < $< > $@
+else
+%.ps: %.dot
+ ${ECHO} "Cannot build $@: The program dot is not installed"
+endif
# 'make clean' nukes the tree
clean::
- $(VERB) rm -rf $(BUILD_OBJ_DIR)/Debug $(BUILD_OBJ_DIR)/Release $(BUILD_OBJ_DIR)/Profile $(BUILD_OBJ_DIR)/Depend
- $(VERB) rm -f core core.[0-9][0-9]* *.o *.d *.so *~ *.flc
- $(VERB) rm -f $(LEX_OUTPUT) $(YACC_OUTPUT)
+ $(VERB) $(RM) -rf $(BUILD_OBJ_DIR)/Debug $(BUILD_OBJ_DIR)/Release $(BUILD_OBJ_DIR)/Profile $(BUILD_OBJ_DIR)/Depend
+ $(VERB) $(RM) -f core core.[0-9][0-9]* *.o *.d *.so *~ *.flc
+ $(VERB) $(RM) -f $(LEX_OUTPUT) $(YACC_OUTPUT)
# If dependencies were generated for the file that included this file,
# include the dependancies now...
@@ -592,12 +717,12 @@
# Create dependencies for the *.cpp files...
#$(SourceDepend): \x
$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Depend/.dir
- $(VERB) $(Depend) $< | sed 's|$*\.o *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
+ $(VERB) $(Depend) $< | $(SED) 's|$*\.o *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
# Create dependencies for the *.c files...
#$(SourceDepend): \x
$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Depend/.dir
- $(VERB) $(DependC) $< | sed 's|$*\.o *|Release/& Profile/& Debug/& Depend/$(@F)|g' > $@
+ $(VERB) $(DependC) $< | $(SED) 's|$*\.o *|Release/& Profile/& Debug/& Depend/$(@F)|g' > $@
ifneq ($(SourceDepend),)
-include $(SourceDepend)
More information about the llvm-commits
mailing list