Merge pull request #44 from edhartnett/ejh_dirs

Renamed some directories now that C and Fortran are separate...
jmrosinski · Sep 5, 2018 · 3ef24f1 · 3ef24f1
2 parents 1969b10 + 32878f1
commit 3ef24f1
Show file tree

Hide file tree

Showing 33 changed files with 15 additions and 99 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -12,7 +12,7 @@ EXTRA_DIST = COPYING README
 
 # This is the list of subdirs for which Makefiles will be constructed
 # and run.
-SUBDIRS = include src ctests bin
+SUBDIRS = include src test bin
 
 install-data-hook:
 

diff --git a/configure.ac b/configure.ac
@@ -181,9 +181,8 @@ fi
 # This is a list of files to be built.
 AC_CONFIG_FILES([Makefile
                  include/Makefile
-                 ctests/Makefile
+                 test/Makefile
                  src/Makefile
-                 src/clib/Makefile
                  bin/Makefile
 		 ])
 

diff --git a/ctests/myclasses.h b/ctests/myclasses.h
diff --git a/ctests/profcxx.C b/ctests/profcxx.C
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,4 +1,13 @@
-# This is the automake file for GPTL source code directories.
-# Ed Hartnett, 5/18/18
+# This automake file generates the Makefile to build the GPTL C library.
+# Ed Hartnett 5/18/18
+
+libgptl_la_CPPFLAGS = -I$(top_srcdir)/include 
+
+# This is our output. The GPTL library.
+lib_LTLIBRARIES = libgptl.la
+
+# These are the source files.
+libgptl_la_SOURCES = f_wrappers.c getoverhead.c gptl.c gptl_papi.c	\
+hashstats.c memstats.c memusage.c pmpi.c print_rusage.c pr_summary.c	\
+util.c
 
-SUBDIRS = clib
diff --git a/src/clib/f_wrappers.c → src/f_wrappers.c b/src/clib/f_wrappers.c → src/f_wrappers.c
diff --git a/src/clib/f_wrappers_pmpi.c → src/f_wrappers_pmpi.c b/src/clib/f_wrappers_pmpi.c → src/f_wrappers_pmpi.c
diff --git a/src/clib/getoverhead.c → src/getoverhead.c b/src/clib/getoverhead.c → src/getoverhead.c
diff --git a/src/clib/gptl.c → src/gptl.c b/src/clib/gptl.c → src/gptl.c
diff --git a/src/clib/gptl_papi.c → src/gptl_papi.c b/src/clib/gptl_papi.c → src/gptl_papi.c
diff --git a/src/clib/hashstats.c → src/hashstats.c b/src/clib/hashstats.c → src/hashstats.c
diff --git a/src/clib/memstats.c → src/memstats.c b/src/clib/memstats.c → src/memstats.c
diff --git a/src/clib/memusage.c → src/memusage.c b/src/clib/memusage.c → src/memusage.c
diff --git a/src/clib/pmpi.c → src/pmpi.c b/src/clib/pmpi.c → src/pmpi.c
diff --git a/src/clib/pr_summary.c → src/pr_summary.c b/src/clib/pr_summary.c → src/pr_summary.c
diff --git a/src/clib/print_rusage.c → src/print_rusage.c b/src/clib/print_rusage.c → src/print_rusage.c
diff --git a/src/clib/util.c → src/util.c b/src/clib/util.c → src/util.c
diff --git a/ctests/Makefile.am → test/Makefile.am b/ctests/Makefile.am → test/Makefile.am
@@ -5,7 +5,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
 # Link to GPTL library.
-AM_LDFLAGS = ${top_builddir}/src/clib/libgptl.la
+AM_LDFLAGS = ${top_builddir}/src/libgptl.la
 
 # These programs will be built but not installed.
 noinst_PROGRAMS = gran_overhead printwhileon

diff --git a/ctests/avail.c → test/avail.c b/ctests/avail.c → test/avail.c
diff --git a/ctests/cygprofile.c → test/cygprofile.c b/ctests/cygprofile.c → test/cygprofile.c
diff --git a/ctests/cygprofilesubs.c → test/cygprofilesubs.c b/ctests/cygprofilesubs.c → test/cygprofilesubs.c
diff --git a/ctests/global.c → test/global.c b/ctests/global.c → test/global.c
diff --git a/ctests/gran_overhead.c → test/gran_overhead.c b/ctests/gran_overhead.c → test/gran_overhead.c
diff --git a/ctests/knownflopcount.c → test/knownflopcount.c b/ctests/knownflopcount.c → test/knownflopcount.c
diff --git a/ctests/nestedomp.c → test/nestedomp.c b/ctests/nestedomp.c → test/nestedomp.c
diff --git a/ctests/papiomptest.c → test/papiomptest.c b/ctests/papiomptest.c → test/papiomptest.c
diff --git a/ctests/pmpi.c → test/pmpi.c b/ctests/pmpi.c → test/pmpi.c
diff --git a/ctests/printwhileon.c → test/printwhileon.c b/ctests/printwhileon.c → test/printwhileon.c
diff --git a/ctests/run_par_pmpi_test.sh → test/run_par_pmpi_test.sh b/ctests/run_par_pmpi_test.sh → test/run_par_pmpi_test.sh
diff --git a/ctests/run_par_test.sh → test/run_par_test.sh b/ctests/run_par_test.sh → test/run_par_test.sh
diff --git a/ctests/summary.c → test/summary.c b/ctests/summary.c → test/summary.c
diff --git a/ctests/testpapi.c → test/testpapi.c b/ctests/testpapi.c → test/testpapi.c
diff --git a/ctests/tst_simple.c → test/tst_simple.c b/ctests/tst_simple.c → test/tst_simple.c