Skip to content

Commit

Permalink
link MathLink executable with absolute paths to FlexibleSUSY libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Voigt authored and Alexander Voigt committed Jul 8, 2016
1 parent 12be98e commit 54b0a7c
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 21 deletions.
1 change: 0 additions & 1 deletion config/Makefile.in
Expand Up @@ -148,7 +148,6 @@ endif
endif

include config/abspathx.mk
include config/libsyntax.mk
include $(patsubst %, %/module.mk, $(MODULES))

ifneq ($(MAKECMDGOALS),clean)
Expand Down
19 changes: 0 additions & 19 deletions config/libsyntax.mk

This file was deleted.

2 changes: 1 addition & 1 deletion templates/module.mk.in
Expand Up @@ -256,7 +256,7 @@ $(DIR)/%.x: $(DIR)/%.o $(LIB@CLASSNAME@) $(LIBFLEXI) $(LIBLEGACY) $(filter-out -
$(ML@CLASSNAME@_MX): $(ML@CLASSNAME@_SRC) $(LIB@CLASSNAME@) $(LIBFLEXI) $(LIBLEGACY) $(filter-out -%,$(LOOPFUNCLIBS)) | $(FCC) $(FXX)
CXX="$(FXX)" REALCXX="$(CXX) $(LDFLAGS) $(CXXFLAGS)" \
CC="$(FCC)" REALCC="$(CC) $(CFLAGS)" MATH="$(MATH)" \
$(MCC) -o $@ $(CPPFLAGS) $(CFLAGS) $(call libsyntax,$^ $(ADDONLIBS) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(BLASLIBS) $(FLIBS) $(SQLITELIBS) $(TSILLIBS) $(LDLIBS),$(LIBEXT))
$(MCC) -o $@ $(CPPFLAGS) $(CFLAGS) $(call abspathx,$^) $(ADDONLIBS) $(filter -%,$(LOOPFUNCLIBS)) $(GSLLIBS) $(BOOSTTHREADLIBS) $(THREADLIBS) $(LAPACKLIBS) $(BLASLIBS) $(FLIBS) $(SQLITELIBS) $(TSILLIBS) $(LDLIBS)

ALLDEP += $(LIB@CLASSNAME@_DEP) $(EXE@CLASSNAME@_DEP) $(ML@CLASSNAME@_DEP)
ALLSRC += $(LIB@CLASSNAME@_SRC) $(EXE@CLASSNAME@_SRC) $(ML@CLASSNAME@_SRC)
Expand Down

0 comments on commit 54b0a7c

Please sign in to comment.