diff options
| author | tradke <tradke@4825ed28-b72c-4eae-9704-e50c059e567d> | 2005-11-16 13:55:46 +0000 |
|---|---|---|
| committer | tradke <tradke@4825ed28-b72c-4eae-9704-e50c059e567d> | 2005-11-16 13:55:46 +0000 |
| commit | f2022e3da0750f90bc9be7ac775d785b9052b328 (patch) | |
| tree | 7d988dcf3b784788eaa2458bad6ac7629dddf6dc | |
| parent | 8dfb67180f171eb85522aca444c26334287987a2 (diff) | |
Undo my last (accidental) modification to these two files.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOHDF5/trunk@226 4825ed28-b72c-4eae-9704-e50c059e567d
| -rw-r--r-- | src/make.configuration.defn | 2 | ||||
| -rw-r--r-- | src/make.configuration.deps | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/make.configuration.defn b/src/make.configuration.defn index 7e9ca9d..aba91f8 100644 --- a/src/make.configuration.defn +++ b/src/make.configuration.defn @@ -2,7 +2,7 @@ # $Header$ # add the recombiner and the IEEEIO converter to the Cactus utitlity tools -ALL_UTILS += hdf5_recombiner hdf5_merge hdf5_extract hdf5_double_to_single hdf5_convert_from_carpetiohdf5 +ALL_UTILS += hdf5_recombiner hdf5_merge hdf5_extract hdf5_double_to_single ifneq ($(strip $(HAVE_FLEXIO)), ) ALL_UTILS += hdf5_convert_from_ieeeio diff --git a/src/make.configuration.deps b/src/make.configuration.deps index 1163053..bb1cae5 100644 --- a/src/make.configuration.deps +++ b/src/make.configuration.deps @@ -52,10 +52,3 @@ $(IOHDF5_BUILD_DIR)/hdf5_convert_from_sdf.o: $(IOHDF5_SRC_DIR)/hdf5_convert_from @echo Compiling $< if [ ! -d $(IOHDF5_BUILD_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(IOHDF5_BUILD_DIR) ; fi $(CC) $< $(IOHDF5_CFLAGS) $(INC_DIRS:%=-I%) -c -o $@ - - -# linking rule for hdf5_convert_from_carpetiohdf5 -$(UTIL_DIR)/hdf5_convert_from_carpetiohdf5: $(IOHDF5_BUILD_DIR)/hdf5_convert_from_carpetiohdf5.o - @echo Creating hdf5_convert_from_carpetiohdf5 in $(UTIL_DIR) from $< - if [ ! -d $(UTIL_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(UTIL_DIR) ; fi - $(LD) $< $(TOP)/datestamp.o $(IOHDF5_LDFLAGS) $(GENERAL_LIBRARIES) -o $@ |