Changeset 2102 for trunk/source/Makefile

Timestamp:

06/05/08 17:08:44 (7 months ago)

Author:

rjrw

Message:

Move Makefile toward flexibility to cope with Windows filesystems and
compilers.

Files:

• trunk/source/Makefile (modified) (6 diffs)

trunk/source/Makefile

@@ -10 +10 @@
 LDLIBS=
 SRCDIR=.
+OBJEXT=o
+LIBEXT=a
+
+# include a configuration file if one exists (or carry on without
+# worrying if it doesn't)
+-include Makefile.conf
 
 main := maincl.cpp
@@ -17 +23 @@
 libsource := ${filter-out ${main},${source}}
 includes := ${notdir ${wildcard ${SRCDIR}/*.h}}
-objects := ${source:.cpp=.o}
-libobjects := ${libsource:.cpp=.o}
-testobjects := ${testsource:.cpp=.o}
-
-# include a configuration file if one exists (or carry on without
-# worrying if it doesn't)
--include Makefile.conf
+objects := ${source:.cpp=.${OBJEXT}}
+libobjects := ${libsource:.cpp=.${OBJEXT}}
+testobjects := ${testsource:.cpp=.${OBJEXT}}
 
 ifneq (${SRCDIR},.)
@@ -93 +95 @@
 CXXFLAGS += -DSVN_REVISION=\"$(REVISION)\"
 
-cloudy.exe : ${preobjects} maincl.o libcloudy.a
-        ${CXX} ${LDFLAGS} -o cloudy.exe maincl.o -L. -lcloudy ${LDLIBS}
+cloudy.exe : ${preobjects} maincl.${OBJEXT} libcloudy.${LIBEXT}
+        ${CXX} ${LDFLAGS} -o cloudy.exe maincl.${OBJEXT} -L. -lcloudy ${LDLIBS}
 
-libcloudy.a: ${libobjects}
-        ar ru libcloudy.a ${libobjects}
-        ${RANLIB} libcloudy.a
+libcloudy.${LIBEXT}: ${libobjects}
+        ar ru libcloudy.${LIBEXT} ${libobjects}
+        ${RANLIB} libcloudy.${LIBEXT}
 
 clean :
-        rm -f *.o
+        rm -f *.${OBJEXT}
         rm -f *.h.gch
         rm -rf SunWS_cache
-        rm -f libcloudy.a
+        rm -f libcloudy.${LIBEXT}
         rm -f cloudy.exe
         rm -f runtests.exe
 
 distclean :
-        rm -f *.o
+        rm -f *.${OBJEXT}
         rm -f *.h.gch
         rm -rf SunWS_cache
-        rm -f libcloudy.a
+        rm -f libcloudy.${LIBEXT}
         rm -f cloudy.exe
         rm -f runtests.exe
@@ -125 +127 @@
         @echo "Updating dependency file, this may take a little while"
         @cd ${SRCDIR}; \
-        ${CXXDEPEND} -MM -DMM ${CXXDEFINES} ${source} | sed "s/${presource}/${substname}/" > $(PWD)/Makefile.dep; \
-        ${CXXDEPEND} -MM -DMM ${CXXDEFINES} ${testsource} | sed "s/${presource}/${substname}/" >> $(PWD)/Makefile.dep; \
-        ${CXXDEPEND} -MM -DMM ${CXXDEFINES} ${presource} | sed 's/\.o:/.h.gch:/' >> $(PWD)/Makefile.dep;
+        ${CXXDEPEND} -MM -DMM ${CXXDEFINES} ${source} | sed "s/${presource}/${substname}/" | sed "s/\.o/.${OBJEXT}/" > "$(PWD)/Makefile.dep"; \
+        ${CXXDEPEND} -MM -DMM ${CXXDEFINES} ${testsource} | sed "s/${presource}/${substname}/" | sed "s/\.o/.${OBJEXT}/" >> "$(PWD)/Makefile.dep"; \
+        ${CXXDEPEND} -MM -DMM ${CXXDEFINES} ${presource} | sed 's/\.o:/.h.gch:/' >> "$(PWD)/Makefile.dep";
 
-cpu.o:
+cpu.${OBJEXT}:
         ${CXX} ${CXXFLAGS} -c -DCLOUDY_DATA_PATH=\"${CDP}\" $<
 
 # an explicit -O0 is needed for some compilers like icc
-parse_crashdo.o:
+parse_crashdo.${OBJEXT}:
         ${CXX} ${CXXFLAGSNOOPT} -O0 -c $<
 
@@ -145 +147 @@
         valgrind --leak-check=full --track-fds=yes ./runtests.exe
 
-runtests.exe: ${testobjects} libcloudy.a
-        ${CXX} ${CXXFLAGS} -o $@ ${filter-out %.a, $^} \
+runtests.exe: ${testobjects} libcloudy.${LIBEXT}
+        ${CXX} ${CXXFLAGS} -${OBJEXT} $@ ${filter-out %.${LIBEXT}, $^} \
         ${LDFLAGS} -L. -lcloudy -Llib -lUnitTest++ ${LDLIBS}
 
 ${testobjects}: CXXFLAGS += -I${SRCDIR}/include/UnitTest++
 
-${testobjects}: lib/libUnitTest++.a
+${testobjects}: lib/libUnitTest++.${LIBEXT}
 
-lib/libUnitTest++.a:
+lib/libUnitTest++.${LIBEXT}:
         cd ${SRCDIR}/../library/UnitTest++; \
         $(MAKE) clean; $(MAKE) CC=${CXX} CCFLAGS="${CXXFLAGS}"; \
@@ -161 +163 @@
         cp src/Win32/*.h ${PWD}/include/UnitTest++/Win32; \
         cp src/Posix/*.h ${PWD}/include/UnitTest++/Posix; \
-        cp libUnitTest++.a ${PWD}/lib/
+        cp libUnitTest++.${LIBEXT} ${PWD}/lib/
 
 # only include Makefile.dep when we really need it, this prevents unnecessary builds of Makefile.dep