[Darshan-commits] [Darshan] branch, dev-modular, updated. darshan-2.3.1-54-gf234f66

Service Account git at mcs.anl.gov
Wed Mar 18 15:23:39 CDT 2015


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".

The branch, dev-modular has been updated
       via  f234f6623002245d75e3be3341fed24c1cbe88a9 (commit)
      from  e47a391ca48676c5a7e0f4392d023bab9d92fe12 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f234f6623002245d75e3be3341fed24c1cbe88a9
Author: Shane Snyder <ssnyder at mcs.anl.gov>
Date:   Wed Mar 18 15:23:04 2015 -0500

    darshan-util out-of-tree build bug

-----------------------------------------------------------------------

Summary of changes:
 darshan-util/Makefile.in |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Diff of changes:
diff --git a/darshan-util/Makefile.in b/darshan-util/Makefile.in
index 55a97dc..1e3ad31 100644
--- a/darshan-util/Makefile.in
+++ b/darshan-util/Makefile.in
@@ -1,4 +1,4 @@
-all: darshan-util-lib darshan-posix-parser
+all: libdarshan-util.a darshan-posix-parser
 
 DESTDIR =
 srcdir = @srcdir@
@@ -54,14 +54,14 @@ darshan-posix-logutils.po: darshan-posix-logutils.c darshan-logutils.h darshan-p
 libdarshan-util.so: darshan-logutils.po darshan-posix-logutils.po
 	$(CC) $(CFLAGS_SHARED) $(LDFLAGS) -o $@ $^ $(LIBS)
 	
-darshan-util-lib: darshan-logutils.o darshan-posix-logutils.o
+libdarshan-util.a: darshan-logutils.o darshan-posix-logutils.o
 	ar rcs libdarshan-util.a $^
 
 jenkins: util/bin/jenkins.o lookup3.o
 	$(CC) $(CFLAGS)  $(LDFLAGS) $< -o $@ lookup3.o $(LIBS)
 
-darshan-posix-parser: darshan-posix-parser.c darshan-logutils.h darshan-posix-logutils.h $(DARSHAN_LOG_FORMAT) $(srcdir)/../darshan-posix-log-format.h darshan-util-lib | uthash-1.9.2
-	$(CC) $(CFLAGS) $(LDFLAGS) darshan-posix-parser.c libdarshan-util.a -o $@ $(LIBS) 
+darshan-posix-parser: darshan-posix-parser.c darshan-logutils.h darshan-posix-logutils.h $(DARSHAN_LOG_FORMAT) $(srcdir)/../darshan-posix-log-format.h libdarshan-util.a | uthash-1.9.2
+	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS) 
 
 #darshan-parser: darshan-parser.c $(DARSHAN_LOG_FORMAT) darshan-logutils.h darshan-logutils.o | uthash-1.9.2
 #	$(CC) $(CFLAGS) $(LDFLAGS) $< darshan-logutils.o -o $@ $(LIBS) 


hooks/post-receive
--



More information about the Darshan-commits mailing list