darshan runtime makefile cleanup

darshan-runtime/Makefile.in

 all: lib/libdarshan.a
-#all: lib/libdarshan-posix.a lib/libdarshan-mpi-io.a lib/libdarshan-stubs.a
 
 DESTDIR =
 srcdir = @srcdir@
@@ -19,9 +18,9 @@ DISABLE_LDPRELOAD = @DISABLE_LDPRELOAD@
 DARSHAN_LOG_FORMAT = $(srcdir)/../darshan-log-format.h
 DARSHAN_VERSION = @DARSHAN_VERSION@
 
-#ifndef DISABLE_LDPRELOAD
-#all: lib/libdarshan.so 
-#endif
+ifndef DISABLE_LDPRELOAD
+all: lib/libdarshan.so 
+endif
 
 VPATH = $(srcdir)
 
@@ -40,36 +39,6 @@ lib/darshan-core.o: lib/darshan-core.c darshan-core.h $(DARSHAN_LOG_FORMAT) | li
 lib/darshan-common.o: lib/darshan-common.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
 	$(CC) $(CFLAGS) -c $< -o $@
 
-#lib/darshan-mpi-io.o: lib/darshan-mpi-io.c darshan.h darshan-dynamic.h $(DARSHAN_LOG_FORMAT) | lib
-#	$(CC) $(CFLAGS) -c $< -o $@
-
-#lib/darshan-mpi-io.po: lib/darshan-mpi-io.c darshan.h darshan-dynamic.h $(DARSHAN_LOG_FORMAT) | lib
-#	$(CC) $(CFLAGS_SHARED) -c $< -o $@
-
-#lib/darshan-mpi-init-finalize.o: lib/darshan-mpi-init-finalize.c darshan.h darshan-dynamic.h $(DARSHAN_LOG_FORMAT) | lib
-#	$(CC) $(CFLAGS) -c $< -o $@
-
-#lib/darshan-mpi-init-finalize.po: lib/darshan-mpi-init-finalize.c darshan.h darshan-dynamic.h $(DARSHAN_LOG_FORMAT) | lib
-#	$(CC) $(CFLAGS_SHARED) -c $< -o $@
-
-#lib/darshan-pnetcdf-stubs.o: lib/darshan-pnetcdf-stubs.c darshan.h $(DARSHAN_LOG_FORMAT) | lib 
-#	$(CC) $(CFLAGS) -c $< -o $@
-
-#lib/darshan-pnetcdf.o: lib/darshan-pnetcdf.c darshan.h $(DARSHAN_LOG_FORMAT) | lib 
-#	$(CC) $(CFLAGS) -c $< -o $@
-
-#lib/darshan-pnetcdf.po: lib/darshan-pnetcdf.c darshan.h $(DARSHAN_LOG_FORMAT) | lib 
-#	$(CC) $(CFLAGS_SHARED) -c $< -o $@
-
-#lib/darshan-hdf5.o: lib/darshan-hdf5.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
-#	$(CC) $(CFLAGS) -c $< -o $@
-
-#lib/darshan-hdf5-stubs.o: lib/darshan-hdf5-stubs.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
-#	$(CC) $(CFLAGS) -c $< -o $@
-
-#lib/darshan-hdf5.po: lib/darshan-hdf5.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
-#	$(CC) $(CFLAGS_SHARED) -c $< -o $@
-
 lib/darshan-posix.o: lib/darshan-posix.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
 	$(CC) $(CFLAGS) -c $< -o $@
 
@@ -94,24 +63,12 @@ lib/lookup8.o: lib/lookup8.c
 lib/libdarshan.a: lib/darshan-posix.o lib/darshan-core.o lib/darshan-common.o lib/lookup3.o lib/lookup8.o
 	ar rcs $@ $^
 
-#lib/libdarshan-mpi-io.a: lib/darshan-mpi-io.o lib/darshan-mpi-init-finalize.o lib/darshan-pnetcdf.o lib/darshan-hdf5.o
-#	ar rcs $@ $^
-
-#lib/libdarshan-stubs.a: lib/darshan-pnetcdf-stubs.o lib/darshan-hdf5-stubs.o
-#	ar rcs $@ $^
-
-#lib/libdarshan-posix.a: lib/darshan-posix.o lib/lookup3.o lib/lookup8.o 
-#	ar rcs $@ $^
-
 #lib/libdarshan.so: lib/darshan-mpi-io.po lib/darshan-mpi-init-finalize.po lib/darshan-pnetcdf.po lib/darshan-hdf5.po lib/darshan-posix.po lib/lookup3.po lib/lookup8.po
 #	$(CC) $(CFLAGS_SHARED) $(LDFLAGS) -o $@ $^ -lpthread -lrt -lz -ldl
 
 install:: all
 	install -d $(libdir)
 	install -m 755 lib/libdarshan.a $(libdir)
-#	install -m 755 lib/libdarshan-posix.a $(libdir)
-#	install -m 755 lib/libdarshan-mpi-io.a $(libdir)
-#	install -m 755 lib/libdarshan-stubs.a $(libdir)
 #ifndef DISABLE_LDPRELOAD
 #	install -m 755 lib/libdarshan.so $(libdir)
 #endif
@@ -120,7 +77,7 @@ install:: all
 	install -m 755 darshan-gen-cc.pl $(bindir)
 #	install -m 755 darshan-gen-cxx.pl $(bindir)
 #	install -m 755 darshan-gen-fortran.pl $(bindir)
-#	install -m 755 darshan-config $(bindir)
+	install -m 755 darshan-config $(bindir)
 #	install -d $(datarootdir)/craype-1.x/modulefiles/darshan
 #	install -m 755 share/craype-1.x/darshan-module $(datarootdir)/craype-1.x/modulefiles/darshan/$(DARSHAN_VERSION)
 #	install -d $(datarootdir)/craype-2.x/modulefiles/darshan

darshan-runtime/darshan-config.in

@@ -10,10 +10,10 @@ DARSHAN_LD_FLAGS="@LDFLAGS@"
 #   final one is necessary to give the linker a change to resolve indirect
 #   dependencies on PnetCDF and HDF5 symbols (if the app used a library which 
 #   in turn used one of those HLLs).
-PRE_LD_FLAGS="-L$DARSHAN_LIB_PATH $DARSHAN_LD_FLAGS -ldarshan-core -lz $CP_WRAPPERS"
-POST_LD_FLAGS="-L$DARSHAN_LIB_PATH -ldarshan-core -lz -lrt -lpthread"
-#PRE_LD_FLAGS="-L$DARSHAN_LIB_PATH $DARSHAN_LD_FLAGS -ldarshan-mpi-io -lz $CP_WRAPPERS"
-#POST_LD_FLAGS="-L$DARSHAN_LIB_PATH -ldarshan-posix -ldarshan-mpi-io -lz -lrt -lpthread"
+
+# TODO: extra -lmpi in POST_LD_FLAGS -- link ordering issue
+PRE_LD_FLAGS="-L$DARSHAN_LIB_PATH $DARSHAN_LD_FLAGS -ldarshan -lz $CP_WRAPPERS"
+POST_LD_FLAGS="-L$DARSHAN_LIB_PATH -ldarshan -lmpi -lz -lrt -lpthread"
 
 usage="\
 Usage: darshan-config [--pre-ld-flags] [--post-ld-flags]"