Changeset 576 for trunk

Timestamp:

Feb 19, 2007, 6:16:51 AM (18 years ago)

Author:

dkearney

Message:

moved rappture.h to rappture2.h becasue src/core already has a rappture.h
also changed Ptr.h, Ptr.cpp, and Outcome.h to use rappture2.h
updated Makefile.in, Makefile will now be created by rappture's configure.in

Location:

trunk/src2/core

Files:

• Makefile.in (modified) (3 diffs)
• Outcome.h (modified) (1 diff)
• Ptr.cpp (modified) (1 diff)
• Ptr.h (modified) (1 diff)
• rappture2.h (moved) (moved from trunk/src2/core/rappture.h)

trunk/src2/core/Makefile.in

@@ -12 +12 @@
 #    make install prefix=$HOME
 
-# CXX             = @CXX@
-CXX             = g++
+CXX             = @CXX@
+# CXX             = g++
 
 CFLAGS=-g -Wall
@@ -37 +37 @@
 EXE=
 
-# prefix = @prefix@
-prefix = /apps/rappture/20070216
+prefix = @prefix@
+# prefix = /apps/rappture/20070216
 exec_prefix = ${prefix}
 libdir = ${exec_prefix}/lib
@@ -97 +97 @@
         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 $(LIBS) $(libdir)
         cd $(libdir); chmod 755 $(LIBS)

trunk/src2/core/Outcome.h

@@ -13 +13 @@
 #define RAPPTURE_OUTCOME_H
 
-#include "rappture.h"
+#include "rappture2.h"
 
 namespace Rappture {

trunk/src2/core/Ptr.cpp

@@ -10 +10 @@
  * ======================================================================
  */
-#include "rappture.h"
+#include "rappture2.h"
 
 using namespace Rappture;

trunk/src2/core/Ptr.h

@@ -13 +13 @@
 #define RAPPTURE_PTR_H
 
-#include "rappture.h"
+#include "rappture2.h"
 
 namespace Rappture {