dist fixes

nlslatt · Feb 23, 2016 · b056233 · b056233
1 parent 7b35d4e
commit b056233
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 31 deletions.
diff --git a/sprockit b/sprockit
diff --git a/sstmac/common/Makefile.am b/sstmac/common/Makefile.am
@@ -58,7 +58,7 @@ if VTK_ENABLE
  AM_LIBS = $(VTK_LIBS)
 endif
 
-nodist_library_include_HEADERS = sstmac_config.h
+nodist_library_include_HEADERS = sstmac_config.h config.h
 
 library_includedir=$(includedir)/sstmac/common
 
@@ -81,7 +81,6 @@ nobase_library_include_HEADERS = \
   runtime.h \
   timestamp.h \
   timestamp_fwd.h \
-  config.h \
   sst_event.h \
   sst_event_fwd.h \
   thread_info.h \

diff --git a/sstmac/libraries/pthread/Makefile.am b/sstmac/libraries/pthread/Makefile.am
@@ -23,6 +23,9 @@ libsstmac_pthread_la_SOURCES = \
   sstmac_pthread_runner.cc \
   sstmac_sched.cc 
 
+nodist_library_include_HEADERS = \
+  sstmac_sys_types.h
+
 nobase_library_include_HEADERS = \
   sstmac_cpu_set.h \
   sstmac_pthread_impl.h \
@@ -32,6 +35,5 @@ nobase_library_include_HEADERS = \
   sstmac_pthread_runner.h \
   sstmac_sched.h \
   sstmac_sched_macro.h \
-  sstmac_sched_clear_macros.h \
-  sstmac_sys_types.h
+  sstmac_sched_clear_macros.h 
 
diff --git a/sstmac/replacements/Makefile.am b/sstmac/replacements/Makefile.am
@@ -12,12 +12,20 @@
 include $(top_srcdir)/Makefile.common
 
 library_includedir=$(includedir)/sstmac/replacements
+nobase_library_includedir=$(includedir)/sstmac/replacements
 
-nobase_library_include_HEADERS = \
+nobase_nodist_library_include_HEADERS = 
+nobase_library_include_HEADERS = 
+
+nobase_nodist_library_include_HEADERS += \
   mpi.h 
 
 if USE_REPLACEMENT_HEADERS
 nobase_library_include_HEADERS += \
+  linux/mmtimer.h \
+  sys/types.h 
+
+nobase_nodist_library_include_HEADERS += \
   fstream \
   iostream \
   istream \
@@ -33,8 +41,6 @@ nobase_library_include_HEADERS += \
   signal.h \
   sstmac_pthread_clear.h \
   sstmac_pthread_return.h \
-  linux/mmtimer.h \
-  sys/types.h \
   sys/time.h \
   sys/signal.h
 endif

diff --git a/sstmac/replacements/fstream.in b/sstmac/replacements/fstream.in
@@ -1,19 +1,12 @@
 #ifndef SSTMAC_INSIDE_STL
 #define SSTMAC_INSIDE_STL
 
-#ifdef SSTMAC_PTHREAD_MACRO_H 
-//if sstmac pthread included, clear it
-#include <sstmac/libraries/pthread/sstmac_pthread_clear_macros.h>
-#endif
+#include <sstmac/replacements/sstmac_pthread_clear.h>
 
 #include "@STL_HEADER_FSTREAM_FULL_PATH@"
 #undef SSTMAC_INSIDE_STL
 
-#ifdef SSTMAC_PTHREAD_MACRO_H 
-//if sstmac pthread included, bring it back
-#undef SSTMAC_PTHREAD_MACRO_H
-#include <sstmac/libraries/pthread/sstmac_pthread_macro.h>
-#endif
+#include <sstmac/replacements/sstmac_pthread_return.h>
 
 #else
 #include "@STL_HEADER_FSTREAM_FULL_PATH@"

diff --git a/sumi b/sumi
diff --git a/tests/Makefile.skeleton_tests b/tests/Makefile.skeleton_tests
@@ -23,15 +23,6 @@ endif
 
 SKELETONTESTS = $(SKELETONCASES:%=test_skeleton_%)
 
-# these are run with different flags
-MPICASES = 
-if ENABLE_DEBUG
-MPICASES += lulesh
-endif
-
-SKELETONTESTS += \
-  $(MPICASES:%=test_mpi_apps_%) 
-
 SKELETON_DEFINES=
 if HAVE_ATOMIC_BUILTIN
   SKELETON_DEFINES += -DHAVE_ATOMIC_BUILTIN
@@ -46,10 +37,6 @@ $(SKELETONCASES): skeletons
 	cd skeletons/$@; PATH=$(bindir):$$PATH \
           SKELETON_DEFINES=$(SKELETON_DEFINES) $(MAKE)
 
-$(MPICASES): skeletons
-	cd skeletons/$@; PATH=$(bindir):$$PATH $(MAKE)
-
-
 test_skeleton_%.$(CHKSUF): % 
 	$(top_srcdir)/bin/runtest 3 $@ ./skeletons/$*/run$* --help