Skip to content
This repository was archived by the owner on Mar 20, 2023. It is now read-only.

Commit 981acd6

Browse files
author
Nicolas Cornu
authored
Replace ENGINEMECH_OBJ by the name of the file in the Makefile (#436)
1 parent c5f6563 commit 981acd6

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

extra/nrnivmodl_core_makefile.in

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,24 +164,23 @@ $(SPECIAL_EXE): coremech_lib_target
164164
-L$(OUTPUT_DIR) -l$(COREMECH_LIB_NAME) $(CORENRNLIB_FLAGS) $(LDFLAGS) \
165165
-Wl,-rpath,'$(LIB_RPATH)' -Wl,-rpath,$(CORENRN_LIB_DIR)
166166

167-
coremech_lib_target: enginemech_object $(corenrnmech_lib_target)
167+
coremech_lib_target: $(corenrnmech_lib_target)
168168
rm -rf $(OUTPUT_DIR)/.libs; \
169169
mkdir -p $(OUTPUT_DIR)/.libs; \
170170
ln -s ${COREMECH_LIB_PATH} $(OUTPUT_DIR)/.libs/libcorenrnmech$(LIB_SUFFIX)
171171

172-
enginemech_object:
173-
mkdir -p $(MOD_OBJS_DIR)
172+
$(ENGINEMECH_OBJ): | $(MOD_OBJS_DIR)
174173
$(CXX_COMPILE_CMD) -c -DADDITIONAL_MECHS $(CORENRN_SHARE_CORENRN_DIR)/enginemech.cpp -o $(ENGINEMECH_OBJ)
175174

176175
# build shared library of mechanisms
177-
coremech_lib_shared: $(ALL_OBJS) enginemech_object build_always
176+
coremech_lib_shared: $(ALL_OBJS) $(ENGINEMECH_OBJ) build_always
178177
$(CXX_SHARED_LIB_CMD) $(ENGINEMECH_OBJ) -o ${COREMECH_LIB_PATH} $(ALL_OBJS) \
179178
-I$(CORENRN_INC_DIR) $(INCFLAGS) \
180179
$(LDFLAGS) $(CORENRN_LIB_DIR)/libscopmath.a \
181180
${SONAME_OPTION} $(CORENRNLIB_FLAGS) -Wl,-rpath,$(CORENRN_LIB_DIR);
182181

183182
# build static library of mechanisms
184-
coremech_lib_static: $(ALL_OBJS) enginemech_object build_always
183+
coremech_lib_static: $(ALL_OBJS) $(ENGINEMECH_OBJ) build_always
185184
mkdir -p $(MOD_OBJS_DIR)/scopmath; \
186185
cd $(MOD_OBJS_DIR)/scopmath && ar -x $(CORENRN_LIB_DIR)/libscopmath.a && cd -;\
187186
rm -f ${COREMECH_LIB_PATH}; \

0 commit comments

Comments
 (0)