Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
nek5000
giraffe
Commits
e1bb303b
Commit
e1bb303b
authored
Apr 24, 2018
by
Kevin Dugan
Browse files
Generalized flibs
parent
cce1aa35
Changes
2
Hide whitespace changes
Inline
Side-by-side
config/giraffe.mk.in
View file @
e1bb303b
...
...
@@ -15,7 +15,7 @@ nek_LDFLAGS := @LDFLAGS@
nek_LIBS := $(libmesh_LIBS)
nek_FFLAGS := @FFLAGS@ @FCFLAGS_f@ $(subst -D, @FC_DEFINE@, @DEFS@ @nek_DEFS@) $(nek_INCLUDES)
nek_FLIBS :=
$(libmesh_
LIBS
)
nek_FLIBS :=
@F
LIBS
@
nek_debug_flags := @nek_debug_flags@
nek_opt_flags := @nek_opt_flags@
...
...
@@ -62,13 +62,10 @@ jl_cgs_obj := $(addprefix $(nek_objdir)/, $(patsubst %, $(jl_prefix)%.$(obj-
nek_clib_obj := $(nek_core_c_obj) $(jl_core_obj) $(jl_interp_obj) $(jl_cgs_obj)
# == MOOSE app flags and objects ==================================================================
# Recursive definition (= rather than :=) is probably the right usage, since they're probably
# defined here after they're referenced by MOOSE makefile
ADDITIONAL_CPPFLAGS = $(libmesh_CPPFLAGS) @DEFS@ # Used by pattern rules in moose/framework/build.mk
ADDITIONAL_INCLUDES = $(nek_INCLUDES) # Used by pattern rules in moose/framework/build.mk (through app_INCLUDES)
ADDITIONAL_LIBS = $(nek_LIBS) $(nek_FLIBS) # Used during linking in moose/framework/app.mk
ADDITIONAL_APP_OBJECTS = $(nek_flib_obj) $(nek_clib_obj) # Added to dependencies in moose/framework/app.mk
ADDITIONAL_CPPFLAGS := $(ADDITIONAL_CPPFLAGS) $(libmesh_CPPFLAGS) @DEFS@ # Used by pattern rules in moose/framework/build.mk
ADDITIONAL_INCLUDES := $(ADDITIONAL_INCLUDES) $(nek_INCLUDES) # Used by pattern rules in moose/framework/build.mk (through app_INCLUDES)
ADDITIONAL_LIBS := $(ADDITIONAL_LIBS) $(nek_LIBS) $(nek_FLIBS) # Used during linking in moose/framework/app.mk
ADDITIONAL_APP_OBJECTS := $(ADDITIONAL_APP_OBJECTS) $(nek_flib_obj) $(nek_clib_obj) # Added to dependencies in moose/framework/app.mk
# == Rules =========================================================================================
...
...
configure.ac
View file @
e1bb303b
...
...
@@ -528,6 +528,8 @@ fi
# ALL DONE!
###############################################################################
FLIBS="$(echo ${FLIBS} | sed 's/mesh_\(opt\|dbg\|oprof\)/mesh_\$\(METHOD\)/')" # Replace specific libmesh library with general expresion. Ex: -lmesh_opt -> -lmesh_$(METHOD).
AC_CONFIG_FILES([giraffe.mk:config/giraffe.mk.in
$GIRAFFE_EXAMPLE/SESSION.NAME:config/SESSION.NAME.in])
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment