more mmap logic and instrumentation for testing

darshan-runtime/Makefile.in

@@ -33,15 +33,8 @@ CFLAGS_SHARED = -DDARSHAN_CONFIG_H=\"darshan-runtime-config.h\" -I . -I$(srcdir)
 
 LIBS = -lz @LIBBZ2@
 
-static-mod-objs = lib/darshan-posix.o lib/darshan-mpiio.o lib/darshan-hdf5.o lib/darshan-pnetcdf.o
-dynamic-mod-objs = lib/darshan-posix.po lib/darshan-mpiio.po lib/darshan-hdf5.po lib/darshan-pnetcdf.po
-
-ifdef DARSHAN_USE_BGQ
-static-mod-objs += lib/darshan-bgq.o
-dynamic-mod-objs += lib/darshan-bgq.po
-CFLAGS += -DDARSHAN_BGQ
-CFLAGS_SHARED += -DDARSHAN_BGQ
-endif
+static-mod-objs = lib/darshan-posix.o
+dynamic-mod-objs = lib/darshan-posix.po 
 
 lib::
 	@mkdir -p $@

darshan-util/Makefile.in

@@ -127,6 +127,19 @@ ifeq ($(DARSHAN_ENABLE_SHARED),1)
 	install -m 755 libdarshan-util.so $(libdir)
 endif
 	install -m 644 $(srcdir)/darshan-logutils.h $(includedir)
+	install -m 644 $(srcdir)/darshan-posix-logutils.h $(includedir)
+	install -m 644 $(srcdir)/darshan-mpiio-logutils.h $(includedir)
+	install -m 644 $(srcdir)/darshan-hdf5-logutils.h $(includedir)
+	install -m 644 $(srcdir)/darshan-pnetcdf-logutils.h $(includedir)
+	install -m 644 $(srcdir)/darshan-bgq-logutils.h $(includedir)
+	install -m 644 $(srcdir)/../darshan-posix-log-format.h $(includedir)
+	install -m 644 $(srcdir)/../darshan-mpiio-log-format.h $(includedir)
+	install -m 644 $(srcdir)/../darshan-hdf5-log-format.h $(includedir)
+	install -m 644 $(srcdir)/../darshan-pnetcdf-log-format.h $(includedir)
+	install -m 644 $(srcdir)/../darshan-bgq-log-format.h $(includedir)
+	install -d $(includedir)/uthash-1.9.2
+	install -d $(includedir)/uthash-1.9.2/src
+	install -m 644 uthash-1.9.2/src/uthash.h $(includedir)/uthash-1.9.2/src/
 	install -m 644 $(DARSHAN_LOG_FORMAT) $(includedir)
 	install -m 755 darshan-job-summary/bin/darshan-job-summary.pl $(bindir)
 	install -d $(libdir)/TeX