Changeset 596 for trunk

Timestamp:

Mar 1, 2007 10:30:44 AM (17 years ago)

Author:

dkearney

Message:

fixed librappture2 to be areal library instead of an executable
adjusted rappture pointers to return reference to ptr object.

Location:

trunk/src2/core

Files:

• Makefile.in (modified) (6 diffs)
• RpPtr.h (modified) (1 diff)

trunk/src2/core/Makefile.in

@@ -30 +30 @@
 SHAREDLIBM=librappture2.so.1
 
-AR=ar rc
+AR=ar rcv
 RANLIB=ranlib
 TAR=tar
@@ -43 +43 @@
 man3dir = ${mandir}/man3
 
-OBJS = viz.o RpMesh1D.o RpField1D.o RpMeshTri2D.o RpMeshRect3D.o \
+OBJS = RpMesh1D.o RpField1D.o RpMeshTri2D.o RpMeshRect3D.o \
        RpFieldRect3D.o RpMeshPrism3D.o RpFieldPrism3D.o RpSerialBuffer.o \
        RpSerializer.o RpSerializable.o RpBuffer.o Ptr.o Outcome.o # Lookup.o
@@ -73 +73 @@
 
 $(SHAREDLIBV): $(OBJS)
-        $(LDSHARED) -o $@ $(OBJS) -L ${libdir} -lz -lb64
+        $(LDSHARED) -shared -Wl,-rpath,${libdir} -o $@ $(OBJS) -L ${libdir} -lz -lb64
         rm -f $(SHAREDLIB) $(SHAREDLIBM)
         ln -s $@ $(SHAREDLIB)
@@ -87 +87 @@
 install: $(LIBS) $(SHAREDLIBV)
         -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
-        -@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi
+        -@if [ ! -d $(includedir)/rappture2  ]; then mkdir -p $(includedir)/rappture2; fi
         -@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi
         -@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi
-        cp rappture2.h $(includedir)
-        chmod 644 $(includedir)/rappture2.h
-        cp Ptr.h $(includedir)
-        chmod 644 $(includedir)/Ptr.h
-        cp Outcome.h $(includedir)
-        chmod 644 $(includedir)/Outcome.h
-        cp RpBuffer.h $(includedir)
-        chmod 644 $(includedir)/RpBuffer.h
+        cp *.h $(includedir)/rappture2
+        chmod 644 $(includedir)/rappture2/*.h
         cp $(LIBS) $(libdir)
         cp $(SHAREDLIBV) $(libdir)
@@ -114 +108 @@
 
 uninstall:
-        cd $(includedir); \
+        cd $(includedir)/rappture2; rm *.h; \
         cd $(libdir); rm -f librappture2.a; \
         if test -f $(SHAREDLIBV); then \
@@ -135 +129 @@
 
 # should use librappture2.a or $(LDFLAGS)  but this uses RpOutcome.o
-viz: viz.o RpOutcome.o RpMesh1D.o RpField1D.o RpMeshTri2D.o RpMeshRect3D.o RpFieldRect3D.o RpMeshPrism3D.o RpFieldPrism3D.o RpSerialBuffer.o RpSerializer.o RpSerializable.o
+viz: viz.o libviz.a
         $(CXX) $(CFLAGS) -o viz $^
+
+libviz.a: Outcome.o RpMesh1D.o RpField1D.o RpMeshTri2D.o RpMeshRect3D.o RpFieldRect3D.o RpMeshPrism3D.o RpFieldPrism3D.o RpSerialBuffer.o RpSerializer.o RpSerializable.o RpBuffer.o
+        $(AR) $@ $^
 
 viz.o: viz.cc

trunk/src2/core/RpPtr.h

@@ -151 +151 @@
     }
     _pc = ptr._pc;
+    return *this;
 }