Fix "make dist" so that it produces a buildable tarball. "make distch…

…eck" unfortunately still breaks, as a number of components violate the basic rules of component writing and include source files from other components. Sigh.
KarateSnowMachine · Jan 28, 2014 · d5edf37 · d5edf37
1 parent 787d2f3
commit d5edf37
Show file tree

Hide file tree

Showing 17 changed files with 85 additions and 21 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -6,7 +6,14 @@ ACLOCAL_AMFLAGS = -I config
 
 EXTRA_DIST = \
 	autogen.sh \
-	LICENSE
+	BUGS \
+	ChangeLog \
+	INSTALL \
+	ISSUES \
+	LICENSE \
+	PLATFORMS \
+	README \
+	VERSION
 
 SUBDIRS = \
 	sst \

diff --git a/sst/elements/Makefile.am b/sst/elements/Makefile.am
@@ -6,4 +6,4 @@ DIST_SUBDIRS = $(SST_DIST_ELEMLIBS)
 SUBDIRS = $(SST_ACTIVE_ELEMLIBS)
 
 EXTRA_DIST = \
-	sampleConfigs
+	README.txt
diff --git a/sst/elements/VaultSimC/Makefile.am b/sst/elements/VaultSimC/Makefile.am
@@ -32,6 +32,6 @@ libVaultSimC_la_SOURCES = \
 	libphx/VaultController.h
 
 libVaultSimC_la_CPPFLAGS = $(BOOST_CPPFLAGS) $(MPI_CPPFLAGS) \
-            -I$(top_srcdir)/sst/elements/include -Ilibphx
+            -I$(top_srcdir)/sst/elements/include -I$(srcdir)/libphx
 libVaultSimC_la_LDFLAGS = -module -avoid-version 
 #libVaultSimC_la_LIBADD = $(PHXSIM_LIB)
diff --git a/sst/elements/cpu_data/Makefile.am b/sst/elements/cpu_data/Makefile.am
@@ -6,8 +6,6 @@ AM_CPPFLAGS = \
 	$(BOOST_CPPFLAGS) \
 	$(MPI_CPPFLAGS) 
 
-EXTRA_DIST = makeSDL.pl
-
 compdir = $(pkglibdir)
 comp_LTLIBRARIES = libcpu_data.la
 libcpu_data_la_SOURCES = \

diff --git a/sst/elements/firefly/Makefile.am b/sst/elements/firefly/Makefile.am
@@ -53,6 +53,19 @@ libfirefly_la_SOURCES = \
 	nicTester.h \
 	nicTester.cc \
 	nic.h \
-	nic.cc
+	nic.cc \
+	protocolAPI.h \
+	ioapi.h \
+	ioVec.h \
+	info.h \
+	group.h \
+	ioEvent.h \
+	funcSM/init.h \
+	funcSM/api.h \
+	funcSM/event.h \
+	funcSM/rank.h \
+	funcSM/size.h \
+	merlinEvent.h \
+	nodeInfo.h
 
 libfirefly_la_LDFLAGS = -module -avoid-version
diff --git a/sst/elements/hermes/Makefile.am b/sst/elements/hermes/Makefile.am
@@ -10,6 +10,7 @@ compdir = $(pkglibdir)
 comp_LTLIBRARIES = libhermes.la
 libhermes_la_SOURCES = \
 	msgapi.h \
-	hermes.cc
+	hermes.cc \
+	functor.h
 
 libhermes_la_LDFLAGS = -module -avoid-version
diff --git a/sst/elements/iris/Makefile.am b/sst/elements/iris/Makefile.am
@@ -30,7 +30,9 @@ libiris_la_SOURCES = \
 	ninterface.cc \
 	macsim_terminal.h \
 	macsim_terminal.cc \
-	trig_nic/trig_nic.cc
+	trig_nic/trig_nic.cc \
+	trig_nic/trig_nic.h \
+	ex_macsim_component.h
 
 sstdir = $(includedir)/sst/elements/iris
 nobase_sst_HEADERS = \

diff --git a/sst/elements/m5C/Makefile.am b/sst/elements/m5C/Makefile.am
@@ -2,8 +2,6 @@
 #
 #
 
-EXTRA_DIST = m5.xml
-
 compdir = $(pkglibdir)
 comp_LTLIBRARIES = libm5C.la
 
@@ -12,17 +10,14 @@ libm5C_la_SOURCES = \
     baseCache.cpp \
     bounce.h \
     bridge.cpp \
-    bridge.h \
     bus.cpp \
     busPlus.cpp \
     busPlus.h \
     debug.cpp \
     trace.cpp\
     trace.h\
-    dummyPhysicalMemory.h \
     dummySystem.h \
     dummyThreadContext.h \
-    exeBackingMem.h \
     factory.h \
     factory.cpp \
     loadMemory.cpp \

diff --git a/sst/elements/memHierarchy/Makefile.am b/sst/elements/memHierarchy/Makefile.am
@@ -15,8 +15,6 @@ libmemHierarchy_la_SOURCES = \
 	bus.cc \
 	cache.h \
 	cache.cc \
-	memEvent.h \
-	memTypes.h \
 	trivialCPU.h \
 	trivialCPU.cc \
 	streamCPU.h \

diff --git a/sst/elements/merlin/Makefile.am b/sst/elements/merlin/Makefile.am
@@ -30,6 +30,7 @@ libmerlin_la_SOURCES = \
 	hr_router/xbar_arb_rr.h \
 	trafficgen/trafficgen.h \
 	trafficgen/trafficgen.cc \
+	pymodule.h \
 	pymodule.c \
 	pymerlin.py
 

diff --git a/sst/elements/patterns/Makefile.am b/sst/elements/patterns/Makefile.am
@@ -34,6 +34,7 @@ libpatterns_la_SOURCES = \
 	components/bit_bucket/bit_bucket.cc \
 	components/routermodel/routermodel.h \
 	components/routermodel/routermodel.cc \
+	benchmarks/src_ghost_bench/ghost.h \
 	benchmarks/src_ghost_bench/memory.h \
 	benchmarks/src_ghost_bench/memory.c \
 	benchmarks/src_ghost_bench/ranks.h \
@@ -57,12 +58,19 @@ libpatterns_la_SOURCES = \
 	collective_patterns/collective_topology.h \
 	collective_patterns/collective_topology.cc \
 	support/NIC_model.cc \
+	support/NIC_model.h \
 	support/comm_pattern.cc \
+	support/comm_pattern.h \
 	support/machine_info.cc \
+	support/machine_info.h \
 	support/NIC_stats.cc \
+	support/NIC_stats.h \
 	support/pattern_common.cc \
+	support/pattern_common.h \
 	support/routing.cc \
+	support/routing.h \
 	support/state_machine.cc \
+	support/state_machine.h \
 	patterns.cc \
 	patterns.h
 

diff --git a/sst/elements/portals/Makefile.am b/sst/elements/portals/Makefile.am
@@ -9,4 +9,5 @@ comp_LTLIBRARIES = libportals.la
 
 libportals_la_SOURCES = \
 	portals.cc \
+	driver/driver.h \
 	driver/driver.cc
diff --git a/sst/elements/portals4/Makefile.am b/sst/elements/portals4/Makefile.am
@@ -17,7 +17,17 @@ libportals4_la_SOURCES = \
     ptlNic/ptlNic.cpp \
     ptlNic/ptlNicVCInfo.cpp \
     ptlNic/ptlNic.h \
-    ptlNic/ptlNicEvent.h
+    ptlNic/ptlNicEvent.h \
+    ptlNic/cmdQueueEntry.h \
+    ptlNic/portals4.h \
+    ptlNic/callback.h \
+    ptlNic/ptlNicTypes.h \
+    ptlNic/dmaEvent.h \
+    ptlNic/ptlEvent.h \
+    ptlNic/ptlHdr.h \
+    ptlNic/cmdQueue.h \
+    ptlNic/debug.h \
+    ptlNic/nicMmu.h
 
 libportals4_la_CPPFLAGS = $(BOOST_CPPFLAGS) $(MPI_CPPFLAGS) \
             -I$(top_srcdir)/sst/elements/include \

diff --git a/sst/elements/portals4_sm/Makefile.am b/sst/elements/portals4_sm/Makefile.am
@@ -16,6 +16,7 @@ libportals4_sm_la_SOURCES = \
 	trig_cpu/portals_types.h \
 	trig_cpu/trig_cpu.cc \
 	trig_cpu/trig_cpu.h \
+	trig_cpu/trig_cpu_event.h \
 	trig_cpu/apps/allreduce_recdbl.h \
 	trig_cpu/apps/allreduce_recdbl_trig.h \
 	trig_cpu/apps/allreduce_tree.h \
@@ -35,6 +36,7 @@ libportals4_sm_la_SOURCES = \
 	trig_cpu/barrier_action.h \
 	trig_cpu/apps/ping_pong.h \
 	trig_cpu/apps/bandwidth.h \
+	trig_cpu/apps/eq_test.h \
 	trig_nic/trig_nic.cc \
 	trig_nic/trig_nic.h \
 	trig_nic/trig_nic_event.h

diff --git a/sst/elements/scheduler/Makefile.am b/sst/elements/scheduler/Makefile.am
@@ -25,8 +25,13 @@ GranularMBSAllocator.cc		GranularMBSAllocator.h		OctetMBSAllocator.h		OctetMBSAl
 RoundUpMBSAllocator.cc		Factory.h		Factory.cc \
 LinearAllocator.cc		LinearAllocator.h		FirstFitAllocator.cc		FirstFitAllocator.h		BestFitAllocator.cc \
 BestFitAllocator.h		SortedFreeListAllocator.h		SortedFreeListAllocator.cc ConstraintAllocator.cc 	MeshAllocInfo.cc \
-	MeshAllocInfo.h		FST.cc		FST.h
-
-EXTRA_DIST = makeSDL.pl test.xml test30.xml
+	MeshAllocInfo.h		FST.cc		FST.h \
+	output.h \
+	FaultEvent.h \
+	JobKillEvent.h \
+	CommunicationEvent.h \
+	ObjectRetrievalEvent.h \
+	MBSAllocClasses.h \
+	FinalTimeEvent.h
 
 libscheduler_la_LDFLAGS = -module -avoid-version -L/usr/local/lib64 $(BOOST_LDFLAGS) $(BOOST_FILESYSTEM_LIB) $(BOOST_THREAD_LIB)
diff --git a/sst/elements/sst_mcniagara/Makefile.am b/sst/elements/sst_mcniagara/Makefile.am
@@ -13,11 +13,20 @@ libsst_mcniagara_la_SOURCES = \
 	sst_mcniagara.h \
 	sst_mcniagara.cpp \
 	mcniagara/CycleTracker.cc \
+	mcniagara/CycleTracker.h \
 	mcniagara/MemoryModel.cc \
+	mcniagara/MemoryModel.h \
 	mcniagara/Dependency.cc \
+	mcniagara/Dependency.h \
 	mcniagara/McNiagara.cc \
+	mcniagara/McNiagara.h \
 	mcniagara/stringutil.cc \
-	mcniagara/McNiagara-sim.cc  
+	mcniagara/stringutil.h \
+	mcniagara/McNiagara-sim.cc \
+	mcniagara/McNiagara.h \
+	mcniagara/mersenne.h \
+	mcniagara/McSimDefs.h \
+	mcniagara/OffCpuIF.h
 #	mcniagara/McNiagara-mem.cc \
 #	mcniagara/readdefs.cc 
 

diff --git a/sst/elements/sst_mcopteron/Makefile.am b/sst/elements/sst_mcopteron/Makefile.am
@@ -12,17 +12,31 @@ libsst_mcopteron_la_SOURCES = \
 	sst_mcopteron.h \
 	sst_mcopteron.cpp \
 	mcopteron/McOpteron.cc \
+	mcopteron/McOpteron.h \
 	mcopteron/ConfigVars.cc \
+	mcopteron/ConfigVars.h \
 	mcopteron/InstructionInfo.cc \
+	mcopteron/InstructionInfo.h \
 	mcopteron/ReorderBuffer.cc \
+	mcopteron/ReorderBuffer.h \
 	mcopteron/Dependency.cc \
+	mcopteron/Dependency.h \
 	mcopteron/InstructionQueue.cc \
+	mcopteron/InstructionQueue.h \
 	mcopteron/MemoryModel.cc \
+	mcopteron/MemoryModel.h \
 	mcopteron/Token.cc \
+	mcopteron/Token.h \
 	mcopteron/FunctionalUnit.cc \
+	mcopteron/FunctionalUnit.h \
 	mcopteron/LoadStoreUnit.cc \
+	mcopteron/LoadStoreUnit.h \
 	mcopteron/Random.cc \
 	mcopteron/MarkovModel.cc \
-	mcopteron/OpteronDefs.cc
+	mcopteron/MarkovModel.h \
+	mcopteron/OpteronDefs.cc \
+	mcopteron/OpteronDefs.h \
+	mcopteron/Listener.h \
+	mcopteron/mersenne.h
 
 libsst_mcopteron_la_LDFLAGS = -module -avoid-version