[libcvd-members] libcvd Makefile.in

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        07/12/06 00:00:48

Modified files:
        .              : Makefile.in 

Log message:
        Fixed to prevent rebuilding of debug objects every time.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/Makefile.in?cvsroot=libcvd&r1=1.62&r2=1.63

Patches:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/Makefile.in,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- Makefile.in 5 Dec 2007 23:30:36 -0000       1.62
+++ Makefile.in 6 Dec 2007 00:00:48 -0000       1.63
@@ -279,14 +279,6 @@
 #
 #
 
-OBJS=$(CVD_OBJS)
-
-
-
-DEBUG_OBJS1=$(subst cvd_src,debug/cvd_src,$(OBJS))
-DEBUG_OBJS2=$(subst pnm_src,debug/pnm_src,$(DEBUG_OBJS1))
-DEBUG_OBJS=$(value $(DEBUG_OBJS2))
-
 
 ifeq (@osx_hacks@,yes)
        soname=libcvd.dylib
@@ -310,6 +302,10 @@
        shared=-shared
 endif
 
+OBJS=$(CVD_OBJS)
+
+DEBUG_OBJSA=$(OBJS:cvd_src%=debug/cvd_src%)
+DEBUG_OBJS=$(DEBUG_OBJSA:pnm_src%=debug/pnm_src%)
 
 sos= $(soname) $(soname1) $(soname2) 
 dsos= $(dsoname) $(dsoname1) $(dsoname2) 
@@ -323,9 +319,9 @@
        ln -s $(soname2) $(soname1)
        ln -s $(soname1) $(soname)
 
-$(dsoname): $(DEBUG_OBJS2)
+$(dsoname): $(DEBUG_OBJS)
        rm -f $(dsos)
-       $(CXX) $(CXXFLAGS) $(shared) -o $(dsoname2) $(DEBUG_OBJS2) $(LDFLAGS) 
$(LOADLIBES)
+       $(CXX) $(CXXFLAGS) $(shared) -o $(dsoname2) $(DEBUG_OBJS) $(LDFLAGS) 
$(LOADLIBES)
        ln -s $(dsoname2) $(dsoname1)
        ln -s $(dsoname1) $(dsoname)
 
@@ -337,7 +333,7 @@
        $(AR) crvs libcvd_debug.a $(DEBUG_OBJS)
        $(RANLIB) libcvd_debug.a
 
-directories:
+debug:
        mkdir -p debug/cvd_src debug/cvd_src/IRIX debug/cvd_src/Linux 
debug/cvd_src/OSX debug/cvd_src/fast debug/cvd_src/i686 debug/pnm_src
 
 
@@ -439,16 +435,16 @@
 
 
 
-debug/%.o : %.cc directories
+debug/%.o : %.cc debug
        $(CXX) -I. $(CPPFLAGS) $(CXXFLAGS) $(DEBUGEXTRA) -c $< -o $@
 
-debug/%.o: %.cpp directories
+debug/%.o: %.cpp debug
        $(CXX) -I. $(CPPFLAGS) $(CXXFLAGS) $(DEBUGEXTRA) -c $< -o $@
 
-debug/%.o: %.cxx directories
+debug/%.o: %.cxx debug
        $(CXX) -I. $(CPPFLAGS) $(CXXFLAGS) $(DEBUGEXTRA) -c $< -o $@
 
-debug/%.o: %.C directories
+debug/%.o: %.C debug
        $(CXX) -I. $(CPPFLAGS) $(CXXFLAGS) $(DEBUGEXTRA) -c $< -o $@
 
 debug/%.o: %.s