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

[John Criswell]

Changes in directory llvm:

Makefile.common updated: 1.96.2.4 -> 1.96.2.5

---
Log message:

Reverted back to the original code that builds shared libraries, now that we
have a libtool that works properly on Solaris.


---
Diffs of the changes:

Index: llvm/Makefile.common
diff -u llvm/Makefile.common:1.96.2.4 llvm/Makefile.common:1.96.2.5
--- llvm/Makefile.common:1.96.2.4	Mon Jul 14 09:10:29 2003
+++ llvm/Makefile.common	Mon Jul 14 11:32:48 2003
@@ -395,11 +395,6 @@
 ObjectsP := $(addprefix $(BUILD_OBJ_DIR)/Profile/,$(Objs))
 ObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(Objs))
 
-RealObjs := $(sort $(patsubst Debug/%.o, %.o, $(addsuffix .o,$(notdir $(basename $(Source))))))
-RealObjectsO := $(addprefix $(BUILD_OBJ_DIR)/Release/,$(RealObjs))
-RealObjectsP := $(addprefix $(BUILD_OBJ_DIR)/Profile/,$(RealObjs))
-RealObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(RealObjs))
-
 #---------------------------------------------------------
 # Handle the DIRS and PARALLEL_DIRS options
 #---------------------------------------------------------
@@ -492,28 +487,22 @@
 #--------------------------------------------------------------------
 
 #
-# Determine which flag to use.
-#
-ifeq ($(OS),SunOS)
-SharedOpt=-G
-else
-SharedOpt=-shared
-endif
-
-#
 # Rules for building dynamically linked libraries.
 #
 $(LIBNAME_O): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
 	@echo ======= Linking $(LIBRARYNAME) dynamic release library =======
-	$(VERB) $(LIBTOOL) --mode=link $(CXX) $(SharedOpt) -o $@ $(ObjectsO) $(LibSubDirs) $(LibLinkOpts);
+	$(VERB) $(Link) -o $*.la $(ObjectsO) $(LibSubDirs) $(LibLinkOpts);
+	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT);
 
 $(LIBNAME_P): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir
 	@echo ======= Linking $(LIBRARYNAME) dynamic profile library =======
-	$(VERB) $(LIBTOOL) --mode=link $(CXX) $(SharedOpt) -o $@ $(ObjectsP) $(LibSubDirs) $(LibLinkOpts);
+	$(VERB) $(Link) -o $*.la $(ObjectsP) $(LibSubDirs) $(LibLinkOpts);
+	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT);
 
 $(LIBNAME_G): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
 	@echo ======= Linking $(LIBRARYNAME) dynamic debug library =======
-	$(VERB) $(LIBTOOL) --mode=link $(CXX) $(SharedOpt) -o $@ $(ObjectsG) $(LibSubDirs) $(LibLinkOpts);
+	$(VERB) $(Link) -o $*.la $(ObjectsG) $(LibSubDirs) $(LibLinkOpts);
+	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT);
 
 #
 # Rules for building static archive libraries.