Changeset 4860

Timestamp:

Dec 12, 2014 8:27:25 AM (9 years ago)

Author:

gah

Message:

 

Location:

branches/r9

Files:

• configure.in (modified) (2 diffs)
• lib (moved) (moved from branches/r9/src)
• lib/Makefile.in (modified) (2 diffs)
• lib/core (deleted)
• lib/core2 (deleted)
• lib/rappture (copied) (copied from branches/r9/src/core)
• lib/rappture2 (copied) (copied from branches/r9/src/core2)

branches/r9/configure.in

@@ -2 +2 @@
 AC_INIT([Rappture],[1.4],[rappture@nanohub.org])
 AC_CONFIG_AUX_DIR(cf)
-AC_CONFIG_HEADER(src/core/config.h)
+AC_CONFIG_HEADER(lib/rappture/config.h)
 
 #------------------------------------------------------------------------
@@ -456 +456 @@
 AC_CONFIG_FILES([
     Makefile
-    src/Makefile
-    src/core/Makefile
-    src/core2/Makefile
-    src/objects/Makefile
-    src/objects/RpHash.h
+    lib/Makefile
+    lib/rappture/Makefile
+    lib/rappture2/Makefile
+    lib/objects/Makefile
+    lib/objects/RpHash.h
     gui/Makefile
     apps/Makefile

branches/r9/lib/Makefile.in

@@ -32 +32 @@
 RM              = rm -f
 
-.PHONY: core core2 objects 
+SUBDIRS         = rappture rappture2 objects  
 
-all:    core core2 objects 
+.PHONY: $(SUBDIRS)
 
-RAPPTURE_LIB = core/librappture.a
+all:
+        for i in $(SUBDIRS) ; do \
+          $(MAKE) -C $$i all || exit 1 ;\
+        done
 
-core: 
-        $(MAKE) -C core all
-
-core2: core
-        $(MAKE) -C core2 all
-
-objects: core
-        $(MAKE) -C objects all
-
-install: core
-        $(MAKE) -C core install
-        $(MAKE) -C core2 install
-        $(MAKE) -C objects install
+install:  all
+        for i in $(SUBDIRS) ; do \
+          $(MAKE) -C $$i install || exit 1 ;\
+        done
 
 docs:
@@ -57 +51 @@
 
 clean: 
-        $(MAKE) -C core clean
-        $(MAKE) -C core2 clean
-        $(MAKE) -C objects clean
+        for i in $(SUBDIRS) ; do \
+          $(MAKE) -C $$i clean || exit 1 ;\
+        done
 
 distclean: clean
-        $(MAKE) -C core distclean
-        $(MAKE) -C core2 distclean
-        $(MAKE) -C objects distclean
+        for i in $(SUBDIRS) ; do \
+          $(MAKE) -C $$i distclean || exit 1 ;\
+        done
         $(RM) Makefile