[Libprime-devel-cvs] CVS: libprime/build autoconf.mk.in,1.3,1.4 rules.mk.in,1.3,1.4
Status: Inactive
Brought to you by:
simmo
|
From: Andrew S. <si...@us...> - 2001-12-08 14:13:04
|
Update of /cvsroot/libprime/libprime/build
In directory usw-pr-cvs1:/tmp/cvs-serv3775/build
Modified Files:
autoconf.mk.in rules.mk.in
Log Message:
make the build system even better
Index: autoconf.mk.in
===================================================================
RCS file: /cvsroot/libprime/libprime/build/autoconf.mk.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- autoconf.mk.in 2001/12/08 13:54:57 1.3
+++ autoconf.mk.in 2001/12/08 14:13:01 1.4
@@ -15,20 +15,20 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-SHELL = @SHELL@
+SHELL = @SHELL@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
-AR = @AR@
-AS = @AS@
-LD = @LD@
-RANLIB = @RANLIB@
+AR = @AR@
+AS = @AS@
+LD = @LD@
+RANLIB = @RANLIB@
-OBJ_SUFFIX = @OBJ_SUFFIX@
-LIB_SUFFIX = @LIB_SUFFIX@
-DLL_SUFFIX = @DLL_SUFFIX@
-ASM_SUFFIX = @ASM_SUFFIX@
+OBJ_SUFFIX = @OBJ_SUFFIX@
+LIB_SUFFIX = @LIB_SUFFIX@
+DLL_SUFFIX = @DLL_SUFFIX@
+ASM_SUFFIX = @ASM_SUFFIX@
-LIBPRIME_TESTS = @LIBPRIME_TESTS@
+LIBPRIME_TESTS = @LIBPRIME_TESTS@
Index: rules.mk.in
===================================================================
RCS file: /cvsroot/libprime/libprime/build/rules.mk.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rules.mk.in 2001/12/08 13:54:57 1.3
+++ rules.mk.in 2001/12/08 14:13:01 1.4
@@ -22,25 +22,24 @@
done
endif
-
-all:: $(OBJECTS) $(EXPORT) $(LIB_EXPORT)
- +$(LOOP_OVER_DIRS)
-
-install::
+all:: $(OBJECTS) $(EXE_EXPORT) $(STATIC_EXPORT) $(SHARED_EXPORT)
+$(LOOP_OVER_DIRS)
-$(EXPORT): $(OBJECTS)
- $(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBS) -o $@
-
%.o: %.cpp
$(CXX) -c $< $(CXXFLAGS) $(COMPILE_FLAGS) $(INCLUDES) -o $@
-%.a: $(OBJECTS)
+$(EXE_EXPORT): $(OBJECTS) $(LIBS)
+ $(CXX) $(CXXFLAGS) $(OBJECTS) $(LIBS) -o $@
+
+$(STATIC_EXPORT): $(OBJECTS)
ar cru $@ $?
ranlib $@
+
+$(SHARED_EXPORT): $(OBJECTS) $(LIBS)
+ $(CXX) -shared -Wl,-soname,$@ $(LIBS) $(CXXFLAGS) -o $@ $?
-%.so: $(OBJECTS)
- $(CXX) -shared -Wl,-soname,$@ $(CXXFLAGS) -o $@ $?
+install::
+ +$(LOOP_OVER_DIRS)
clean clobber realclean clobber_all::
-rm -f *.o *.a *.so *.mk $(EXPORT) $(LIB_EXPORT)
|