libcvd-members
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[libcvd-members] gvars3 Makefile.in


From: Edward Rosten
Subject: [libcvd-members] gvars3 Makefile.in
Date: Wed, 13 Apr 2011 11:03:54 +0000

CVSROOT:        /cvsroot/libcvd
Module name:    gvars3
Changes by:     Edward Rosten <edrosten>        11/04/13 11:03:54

Modified files:
        .              : Makefile.in 

Log message:
        Added missing debug+headless version.

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

Patches:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/libcvd/gvars3/Makefile.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- Makefile.in 14 Oct 2009 09:22:19 -0000      1.31
+++ Makefile.in 13 Apr 2011 11:03:54 -0000      1.32
@@ -112,6 +112,7 @@
 #so inst needs to be last.
 
 DEBUG_OBJS=$(OBJS:src%=debug/%)
+DEBUG_HEADLESS_OBJS=$(HEADLESSOBJS:src%=debug/%)
 
 
 ifeq (@build_cpu@,x86_64)
@@ -120,6 +121,11 @@
 
 
 ifeq (@osx_hacks@,yes)
+
+       dhsoname=libGVars3_debug_headless.dylib
+       address@hidden@.dylib
+       address@hidden@address@hidden@.dylib
+        
        dsoname=libGVars3_debug.dylib
        address@hidden@.dylib
        address@hidden@address@hidden@.dylib
@@ -133,6 +139,10 @@
        address@hidden@address@hidden@.dylib
        shared=-dynamiclib
 else
+       dhsoname=libGVars3_debug_headless.so
+       address@hidden@
+       address@hidden@address@hidden@
+
        dsoname=libGVars3_debug.so
        address@hidden@
        address@hidden@address@hidden@
@@ -150,10 +160,12 @@
 archive=libGVars3.a
 harchive=libGVars3_headless.a
 darchive=libGVars3_debug.a
+dharchive=libGVars3_debug_headless.a
 
 sos= $(soname) $(soname1) $(soname2)
 hsos= $(hsoname) $(hsoname1) $(hsoname2)
 dsos= $(dsoname) $(dsoname1) $(dsoname2)
+dhsos= $(dhsoname) $(dhsoname1) $(dhsoname2)
 
 install_shared=install-shared-normal
 
@@ -169,7 +181,20 @@
        install_shared+=install-shared-debug
 endif
 
-all: $(archive) $(soname) $(HEADLESS) $(DEBUG)
+ifeq (@make_headless@@make_debug@,yesyes)
+       DEBUG_HEADLESS=$(dharchive) $(dhsoname)
+       DHarchive=$(dharchive)
+       install_shared+=install-shared-debug-headless
+endif
+
+
+all: $(archive) $(soname) $(HEADLESS) $(DEBUG) $(DEBUG_HEADLESS)
+
+$(dhsoname): $(DEBUG_HEADLESS_OBJS)
+       rm -f $(dhsos)
+       $(CXX) $(shared) -o $(dhsoname2) $(DEBUG_HEADLESS_OBJS) $(LIBS)
+       ln -s $(dhsoname2) $(dhsoname1)
+       ln -s $(dhsoname1) $(dhsoname)
 
 $(dsoname): $(DEBUG_OBJS)
        rm -f $(dsos)
@@ -196,7 +221,7 @@
 
 install-static: $(archive) $(Harchive)
        mkdir -p $(DESTDIR)/$(libdir)
-       cp $(archive) $(Harchive) $(DESTDIR)/$(libdir)
+       cp $(archive) $(Harchive) $(dharchive) $(darchive) $(DESTDIR)/$(libdir)
 
 install-shared-normal: $(soname) 
        mkdir -p $(DESTDIR)/$(libdir)
@@ -216,18 +241,28 @@
        ln -fs  $(DESTDIR)/$(libdir)/$(dsoname2) 
$(DESTDIR)/$(libdir)/$(dsoname1)
        ln -fs  $(DESTDIR)/$(libdir)/$(dsoname1) $(DESTDIR)/$(libdir)/$(dsoname)
        
+install-shared-debug-headless: $(dhsoname) 
+       mkdir -p $(DESTDIR)/$(libdir)
+       cp $(dhsoname2) $(DESTDIR)/$(libdir)
+       ln -fs  $(DESTDIR)/$(libdir)/$(dhsoname2) 
$(DESTDIR)/$(libdir)/$(dhsoname1)
+       ln -fs  $(DESTDIR)/$(libdir)/$(dhsoname1) 
$(DESTDIR)/$(libdir)/$(dhsoname)
+       
+       
 install-headers:
        mkdir -p $(DESTDIR)/$(includedir)
        cp -r gvars3 $(DESTDIR)/$(includedir)
        
 $(darchive): $(DEBUG_OBJS)
-       $(AR) crvs $(darchive) $(DEBUG_OBJS)
+       $(AR) crvs $@ $^
 
 $(harchive): $(HEADLESSOBJS)
-       $(AR) crvs $(harchive) $(HEADLESSOBJS)
+       $(AR) crvs $@ $^
+
+$(dharchive): $(DEBUG_HEADLESS_OBJS)
+       $(AR) crvs $@ $^
 
 $(archive): $(OBJS)
-       $(AR) crvs $(archive) $(OBJS)
+       $(AR) crvs $@ $^
 
 debug: debug/foo
        



reply via email to

[Prev in Thread] Current Thread [Next in Thread]