Commit 2a411d2b authored by Kevin Harms's avatar Kevin Harms
Browse files

Fix out-of-tree builds and installs so they work again. (trac #28)

git-svn-id: 3b7491f3-a168-0410-bf4b-c445ed680a29
parent af8200c0
......@@ -31,14 +31,14 @@ ifneq ($(darshan_lib_path),$(libdir))
@exit 1
@mkdir -p $@
mkdir -p test
tar xjvf extern/uthash-1.9.2.tar.bz2
tar xjvf $(srcdir)/extern/uthash-1.9.2.tar.bz2
darshan-parser: darshan-parser.c darshan.h darshan-log-format.h darshan-logutils.h darshan-logutils.o | uthash-1.9.2
gcc $(CFLAGS) -lz $< darshan-logutils.o -o $@
......@@ -62,16 +62,16 @@ test/gztest: test/gztest.c mktestdir
test/gz-bench: test/gz-bench.c mktestdir
gcc $(CFLAGS) -lz $< -o $@
lib/darshan-mpi-io.o: lib/darshan-mpi-io.c darshan.h darshan-log-format.h | mklibdir
lib/darshan-mpi-io.o: lib/darshan-mpi-io.c darshan.h darshan-log-format.h | lib
$(CC) $(cp_zlib_include_flags) $(CFLAGS_MPI) -c $< -o $@
lib/darshan-pnetcdf.o: lib/darshan-pnetcdf.c darshan.h darshan-log-format.h | mklibdir
lib/darshan-pnetcdf.o: lib/darshan-pnetcdf.c darshan.h darshan-log-format.h | lib
$(CC) $(cp_zlib_include_flags) $(CFLAGS_MPI) -c $< -o $@
lib/darshan-hdf5.o: lib/darshan-hdf5.c darshan.h darshan-log-format.h | mklibdir
lib/darshan-hdf5.o: lib/darshan-hdf5.c darshan.h darshan-log-format.h | lib
$(CC) $(cp_zlib_include_flags) $(CFLAGS_MPI) -c $< -o $@
lib/darshan-posix.o: lib/darshan-posix.c darshan.h darshan-log-format.h | mklibdir
lib/darshan-posix.o: lib/darshan-posix.c darshan.h darshan-log-format.h | lib
$(CC) $(cp_zlib_include_flags) $(CFLAGS_MPI) -c $< -o $@
lib/lookup3.o: lib/lookup3.c
......@@ -103,12 +103,12 @@ install:: all
install -m 755 $(bindir)
install -m 755 util/bin/ $(bindir)
install -d $(libdir)/TeX
install -m 644 util/lib/TeX/ $(libdir)/TeX/
install -m 644 $(srcdir)/util/lib/TeX/ $(libdir)/TeX/
install -d $(libdir)/Number
install -d $(libdir)/Number/Bytes
install -m 644 util/lib/Number/Bytes/ $(libdir)/Number/Bytes
install -m 644 $(srcdir)/util/lib/Number/Bytes/ $(libdir)/Number/Bytes
install -d $(datarootdir)
install -m 644 util/share/* $(datarootdir)
install -m 644 $(srcdir)/util/share/* $(datarootdir)
......@@ -119,4 +119,3 @@ distclean:: clean
rm -f compilers/*-V1R4 compilers/fast/*-V1R4 compilers/*-pcarns
rm -rf uthash-1.9.2
rm -rf autom4te.cache
rm -rf mklibdir
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment