diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-02-23 22:23:01 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-02-23 22:23:01 (GMT) |
| commit | 6977b5afc2f75926edf1ee54b6360883b42d5045 (patch) | |
| tree | b66459fff1cc3762343cc43b9a66dfd204cfee19 /tools | |
| parent | 9dfe1289211092adf5d951f8d9005b83f81af9a0 (diff) | |
| download | hdf5-6977b5afc2f75926edf1ee54b6360883b42d5045.zip hdf5-6977b5afc2f75926edf1ee54b6360883b42d5045.tar.gz hdf5-6977b5afc2f75926edf1ee54b6360883b42d5045.tar.bz2 | |
[svn-r3508] Purpose:
Bug Fix
Description:
We were trying to build the talign test program before the library
was actually built.
Solution:
Moved talign test to the lib directory since it belongs with the
library anyway.
Platforms tested:
Linux
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 12 | ||||
| -rw-r--r-- | tools/lib/Makefile.in | 16 | ||||
| -rw-r--r-- | tools/lib/talign.c (renamed from tools/talign.c) | 0 |
3 files changed, 18 insertions, 10 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index 88c3362..fbbb440 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -21,7 +21,7 @@ CPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/src \ ## Test programs and scripts. ## -TEST_PROGS=talign +TEST_PROGS= TEST_SCRIPTS= ## These are our main targets: library and tools. @@ -33,7 +33,7 @@ PROGS=$(PUB_PROGS) $(TEST_PROGS) ## Source and object files for the tests ## -TEST_SRC=talign.c +TEST_SRC= TEST_OBJ=$(TEST_SRC:.c=.lo) lib :: @@ -45,7 +45,7 @@ progs: $(LIBTOOLS) $(LIBHDF5) done check tests test _test: $(PROGS) - @@SETX@; for d in $(SUBDIRS); do \ + @@SETX@; for d in lib $(SUBDIRS); do \ (cd $$d && $(MAKE) $@) || exit 1; \ done @@ -83,9 +83,3 @@ maintainer-clean: (cd $$d && $(MAKE) $@); \ done -talign: talign.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ talign.lo $(LIBTOOLS) $(LIBHDF5) $(LDFLAGS) $(LIBS) - -.c.lo: - @$(LT_COMPILE) $(CFLAGS) $(CPPFLAGS) -c $< - diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 5e61afd..dc35ebe 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -18,7 +18,7 @@ CPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/src \ ## Test programs and scripts. ## -TEST_PROGS= +TEST_PROGS=talign TEST_SCRIPTS= ## These are our main targets: library and tools. We link this library @@ -27,6 +27,9 @@ TEST_SCRIPTS= ## LT_LINK_LIB=$(LT) --mode=link $(CC) -static -rpath $(libdir) LIB=libh5tools.la +LIBHDF5=$(top_builddir)/src/libhdf5.la +PUB_PROGS= +PROGS=$(PUB_PROGS) $(TEST_PROGS) ## Source and object files for the library; do not install ## @@ -34,10 +37,21 @@ LIB_SRC=h5tools.c h5tools_str.c LIB_OBJ=$(LIB_SRC:.c=.lo) PUB_LIB= +TEST_SRC=talign.c +TEST_OBJ=$(TEST_SRC:.c=.lo) + PRIVATE_HDR=h5tools.h h5tools_str.h ## Programs have to be built before they can be tested! ## check test _test: $(PROGS) +## How to build the programs... They all depend on the hdf5 library and +## the tools library compiled in this directory. +## +$(PROGS): $(LIB) $(LIBHDF5) + +talign: talign.lo + @$(LT_LINK_EXE) $(CFLAGS) -o $@ talign.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @CONCLUDE@ diff --git a/tools/talign.c b/tools/lib/talign.c index 7bf0659..7bf0659 100644 --- a/tools/talign.c +++ b/tools/lib/talign.c |