[C-mpi-commits] SF.net SVN: c-mpi:[13]

[<jmw...@us...>]

Revision: 13
          http://c-mpi.svn.sourceforge.net/c-mpi/?rev=13&view=rev
Author:   jmwozniak
Date:     2010-04-20 04:38:07 +0000 (Tue, 20 Apr 2010)

Log Message:
-----------
Improvements...

Modified Paths:
--------------
    Makefile.in
    setup.sh
    src/gossip/module.mk.in
    src/mpirpc/module.mk.in
    test/adts/module.mk.in

Modified: Makefile.in
===================================================================
--- Makefile.in	2010-04-20 04:26:19 UTC (rev 12)
+++ Makefile.in	2010-04-20 04:38:07 UTC (rev 13)
@@ -562,14 +562,9 @@
 	$(E)rm -fv $(CMPI_DEPS) $(TEST_DEPS) \
                 $(MPIRPC) $(CMPI) $(MPIRPC_OBJS) $(CMPI_OBJS) \
                 $(KDA_OBJS) $(CMPI_IO) $(CMPI_PICS) \
-                hex unhex hexord unpublish node driver            \
-                $(TEST_OUTPUT) $(TEST_PROGS) $(TEST_OBJS) \
-                $(CMPI_PROGS) $(CMPI_CP_OBJS) splint.out \
-                $(GUM_OBJS) \
-                $(GOBS_OBJS) $(GOBS) src/gobs/launch.o \
-                $(GACK_OBJS) $(GACK) \
-                $(SKULLFS_OBJS) \
-                $(ALL_GS_S) $(ALL_GS_I) $(ALL_GS_DUMMY)
+                hex unhex hexord unpublish node driver        \
+                $(TEST_OUTPUT) $(TEST_PROGS) $(TEST_OBJS)     \
+                $(CMPI_PROGS) $(CMPI_CP_OBJS) splint.out
 #	$(E)find . -name "*.avg"       -exec rm -fv \{\} \;
 #	$(E)find . -name "*.per"       -exec rm -fv \{\} \;
 

Modified: setup.sh
===================================================================
--- setup.sh	2010-04-20 04:26:19 UTC (rev 12)
+++ setup.sh	2010-04-20 04:38:07 UTC (rev 13)
@@ -4,11 +4,18 @@
 
 mkdir -p maint/config
 
+if [[ -f configure && 
+      ! configure.ac -nt configure ]] 
+then
+  echo "CMPI configure is up-to-date"
+  exit 2
+fi
+
 if aclocal -I ./maint/config && autoheader && autoconf ; then
-	echo "CMPI configure script successfully regenerated"
+  echo "CMPI configure script successfully regenerated"
 else
-	echo "Some part of configure regeneration failed!"
-	exit 1
+  echo "Some part of configure regeneration failed!"
+  exit 1
 fi
 
 exit 0

Modified: src/gossip/module.mk.in
===================================================================
--- src/gossip/module.mk.in	2010-04-20 04:26:19 UTC (rev 12)
+++ src/gossip/module.mk.in	2010-04-20 04:38:07 UTC (rev 13)
@@ -5,7 +5,6 @@
 
 DIR := src/gossip
 ADT_SRC += $(DIR)/gossip.c
-ADT_SRC += $(DIR)/gs-debug.c
 
 ifdef GOSSIP_ENABLE_BACKTRACE
 MODCFLAGS_$(DIR)/gossip.c := -DGOSSIP_ENABLE_BACKTRACE

Modified: src/mpirpc/module.mk.in
===================================================================
--- src/mpirpc/module.mk.in	2010-04-20 04:26:19 UTC (rev 12)
+++ src/mpirpc/module.mk.in	2010-04-20 04:38:07 UTC (rev 13)
@@ -1,8 +1,4 @@
 
-DIR := $(MPIRPC_DIR)
+DIR := src/mpirpc
 
-ifeq (@USE_MPIRPC_2@,1)
-	MPIRPC_SRC += $(DIR)/mpirpc.c 
-endif
-
-
+MPIRPC_SRC += $(DIR)/mpirpc.c 

Modified: test/adts/module.mk.in
===================================================================
--- test/adts/module.mk.in	2010-04-20 04:26:19 UTC (rev 12)
+++ test/adts/module.mk.in	2010-04-20 04:38:07 UTC (rev 13)
@@ -3,4 +3,4 @@
 
 test/adts/test%.x: test/adts/test%.o src/mpi_tools/mpi_tools.o $(ADT_OBJS)
 	$(Q) "  LINK		$(@) "
-	$(E)$(MPICC) $(MPE) $(<) $(LIBS) src/mpi_tools/mpi_tools.o $(ADT_OBJS) -o $(@)
+	$(E)$(MPICC) $(MPE) $(<) src/mpi_tools/mpi_tools.o $(ADT_OBJS) $(LIBS) -o $(@)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.