Changeset 149 for trunk/src/Makefile

Timestamp:

Dec 13, 2005 8:24:49 AM (19 years ago)

Author:

cxsong

Message:

Replaced -fPIC with CFLAGS, which can be set at compile time.
Added lines to create librappture.a and install in install dir.

File:

• trunk/src/Makefile (modified) (8 diffs)

trunk/src/Makefile

@@ -42 +42 @@
 MEX             = mex
 OCT             = mkoctfile
-
 LN              = ln
 
@@ -71 +70 @@
 INCL_OCTAVE     = -I$(INCLUDES_DIR)/octave
 
+CFLAGS = -fPIC
 
 # default:
@@ -87 +87 @@
 LDLIB_MACOSX = -dynamiclib -o $(LIB_DIR)/$@.dylib
 LDLIB_LINUX = -shared -Wl,-rpath,$(LIB_DIR)/ -Wl,-soname,$@.so -o $(LIB_DIR)/$@.so.0.0
+
 # include rappture library definitions
 
@@ -94 +95 @@
         if test "`uname`" == "Darwin"; then \
                 $(CXX) $(DEGUG) $(LDLIB_MACOSX) $^ $(LIB_SCEW_FLAG) -lm; \
+                ar -r $@.a $^; \
+                ranlib -s $@.a; \
         else \
                 $(CXX) $(DEGUG) $(LDLIB_LINUX) $^ $(LIB_SCEW_FLAG) -lm; \
                 /sbin/ldconfig -n $(LIB_DIR); \
+                ar -r $@.a $^; \
+                ranlib $@.a; \
         fi
 
@@ -102 +107 @@
         if test "`uname`" == "Darwin"; then \
                 cp $<.dylib $(RP_INSTALL_BASE)/lib; \
+                cp $<.a $(RP_INSTALL_BASE)/lib; \
         else \
                 cp -d $<.so* $(RP_INSTALL_BASE)/lib; \
+                cp -d $<.a $(RP_INSTALL_BASE)/lib; \
         fi
 
@@ -144 +151 @@
         cp -d $(OCTAVE_SRC)/*.oct* $(RP_INSTALL_BASE)/lib/octave
 
+
+###############################################
+
 # include core source files
 
 RpLibrary.o: $(CORE_SRC)/RpLibrary.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) $(INCL_RP_DEPS) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) $(INCL_RP_DEPS) -o $@ -c $?
 
 scew_extras.o: $(CORE_SRC)/scew_extras.c
-        $(CC) -fPIC $(DEBUG) $(INCL_CORE) $(INCL_RP_DEPS) -o $@ -c $?
+        $(CC) $(CFLAGS) $(DEBUG) $(INCL_CORE) $(INCL_RP_DEPS) -o $@ -c $?
 
 RpVariable.o: $(CORE_SRC)/RpVariable.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) -o $@ -c $?
 
 RpAbout.o: $(CORE_SRC)/RpAbout.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) -o $@ -c $?
 
 RpNumber.o: $(CORE_SRC)/RpNumber.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) -o $@ -c $?
 
 RpString.o: $(CORE_SRC)/RpString.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) -o $@ -c $?
 
 RpBoolean.o: $(CORE_SRC)/RpBoolean.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) -o $@ -c $?
 
 RpChoice.o: $(CORE_SRC)/RpChoice.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) -o $@ -c $?
 
 RpOption.o: $(CORE_SRC)/RpOption.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) -o $@ -c $?
 
 RpUnitsStd.o: $(CORE_SRC)/RpUnitsStd.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) -o $@ -c $?
 
 RpUnits.o: $(CORE_SRC)/RpUnits.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) -o $@ -c $?
 
 RpBindingsDict.o: $(CORE_SRC)/RpBindingsDict.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) -o $@ -c $?
 
 RpValue.o: $(CORE_SRC)/RpValue.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) -o $@ -c $?
 
 RpValueDouble.o: $(CORE_SRC)/RpValueDouble.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) -o $@ -c $?
 
 RpValueString.o: $(CORE_SRC)/RpValueString.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) -o $@ -c $?
 
 
@@ -196 +206 @@
 
 RpUnitsCInterface.o: $(CEE_SRC)/RpUnitsCInterface.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) $(INCL_CEE) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) $(INCL_CEE) -o $@ -c $?
 
 RpLibraryCInterface.o: $(CEE_SRC)/RpLibraryCInterface.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) $(INCL_CEE) $(INCL_RP_DEPS) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) $(INCL_CEE) $(INCL_RP_DEPS) -o $@ -c $?
 
 
@@ -207 +217 @@
 
 RpUnitsFInterface.o: $(FORT_SRC)/RpUnitsFInterface.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) $(INCL_FORTRAN) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) $(INCL_FORTRAN) -o $@ -c $?
 
 RpFortranCommon.o: $(FORT_SRC)/RpFortranCommon.c
-        $(CXX) -fPIC $(DEBUG) $(INCL_FORTRAN) -o $@ -c $<
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_FORTRAN) -o $@ -c $<
 
 RpLibraryFInterface.o: $(FORT_SRC)/RpLibraryFInterface.cc
-        $(CXX) -fPIC $(DEBUG) $(INCL_CORE) $(INCL_FORTRAN) $(INCL_RP_DEPS) -o $@ -c $?
+        $(CXX) $(CFLAGS) $(DEBUG) $(INCL_CORE) $(INCL_FORTRAN) $(INCL_RP_DEPS) -o $@ -c $?