diff options
| author | tradke <tradke@ebee0441-1374-4afa-a3b5-247f3ba15b9a> | 2005-02-22 15:28:14 +0000 |
|---|---|---|
| committer | tradke <tradke@ebee0441-1374-4afa-a3b5-247f3ba15b9a> | 2005-02-22 15:28:14 +0000 |
| commit | abcb8cf9052052e7e2dbde2a9f27cc2dd8802112 (patch) | |
| tree | 1209887761f080a0d6956a9754b507a285729f85 | |
| parent | f98fa73353a56af879ad76e787096ba87ea3be3b (diff) | |
Use makefile defines provided by other thorns' configuration files.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOFlexIO/trunk@335 ebee0441-1374-4afa-a3b5-247f3ba15b9a
| -rw-r--r-- | src/make.configuration.defn | 4 | ||||
| -rw-r--r-- | src/make.configuration.deps | 19 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/make.configuration.defn b/src/make.configuration.defn index cfa82c5..59eb4d1 100644 --- a/src/make.configuration.defn +++ b/src/make.configuration.defn @@ -4,7 +4,3 @@ # add the IOFlexIO programs to the Cactus utitlity tools ALL_UTILS += ieee_recombiner ieee_extract ieee_convert_from_cactus3 ieee_merge - -# this is the include path for FlexIO header files -# when compiling the utility programs with the internal FlexIO package -FLEXIO_INC_DIRS = $(CCTK_HOME)$(DIRSEP)arrangements/CactusExternal/FlexIO/src diff --git a/src/make.configuration.deps b/src/make.configuration.deps index b7f4950..b9702ba 100644 --- a/src/make.configuration.deps +++ b/src/make.configuration.deps @@ -1,13 +1,20 @@ +IOFLEXIO_BUILD_DIR = $(BUILD_DIR)/IOFlexIO +IOFLEXIO_SRC_DIR = $(PACKAGE_DIR)/CactusPUGHIO/IOFlexIO/src/util + +IOFLEXIO_CFLAGS = -DCCODE -DANSI $(CFLAGS) +IOFLEXIO_CFLAGS += -I$(CONFIG) -I$(BINDINGS_DIR)/include -I$(FLESH_DIR)/include $(INC_DIRS:%=-I%) $(SYS_INC_DIRS:%=-I%) +IOFLEXIO_LDFLAGS = $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) -L$(CCTK_LIBDIR) -l$(CCTK_LIBNAME_PREFIX)FlexIO + + # link stage -$(UTIL_DIR)$(DIRSEP)%: $(BUILD_DIR)$(DIRSEP)IOFlexIO$(DIRSEP)%.o $(CCTK_LIBDIR)/$(LIBNAME_PREFIX)FlexIO$(LIBNAME_SUFFIX) +$(UTIL_DIR)/%: $(IOFLEXIO_BUILD_DIR)/%.o @echo Creating $* in $(UTIL_DIR) from $< if [ ! -d $(UTIL_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(UTIL_DIR) ; fi - $(LD) $(CREATEEXE)$(OPTIONSEP)$@ $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) $< -L$(CCTK_LIBDIR) -lFlexIO + $(LD) $< $(IOFLEXIO_LDFLAGS) -o $@ # compile stage -$(BUILD_DIR)$(DIRSEP)IOFlexIO$(DIRSEP)%.o: $(PACKAGE_DIR)$(DIRSEP)CactusPUGHIO$(DIRSEP)IOFlexIO$(DIRSEP)src$(DIRSEP)util$(DIRSEP)%.c +$(IOFLEXIO_BUILD_DIR)/%.o: $(IOFLEXIO_SRC_DIR)/%.c @echo Compiling $< - if [ ! -d $(BUILD_DIR)$(DIRSEP)IOFlexIO ]; then $(MKDIR) $(MKDIRFLAGS) $(BUILD_DIR)$(DIRSEP)IOFlexIO ; fi - cd $(BUILD_DIR)$(DIRSEP)IOFlexIO - $(CC) $< -DCCODE -DANSI $(CFLAGS) -I$(CONFIG) -I$(BINDINGS_DIR)$(DIRSEP)include -I$(FLESH_DIR)$(DIRSEP)include -I$(FLEXIO_INC_DIRS) $(SYS_INC_DIRS:%=-I%) $(CCOMPILEONLY)$(OPTIONSEP)$@ + if [ ! -d $(IOFLEXIO_BUILD_DIR) ]; then $(MKDIR) $(MKDIRFLAGS) $(IOFLEXIO_BUILD_DIR) ; fi + $(CC) $< $(IOFLEXIO_CFLAGS) -c -o $@ |