Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

buildsys: simplify C compilation build rule #2704

Merged
merged 1 commit into from
Aug 15, 2018
Merged

buildsys: simplify C compilation build rule #2704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions Makefile.rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,8 @@ endif # end of HPCGAP specific code
########################################################################

# OBJS shall contain the names of all object files that constitute GAP.
# So turn all src/*.c and gen/*.c file names in SOURCES into obj/*.lo
OBJS = $(patsubst gen/%.c,obj/%.lo,$(patsubst src/%.c,obj/%.lo,$(SOURCES)))
# So turn all FOO/*.c file names in SOURCES into obj/FOO/*.lo
OBJS = $(patsubst %.c,obj/%.lo,$(SOURCES))

# ensure config.h is built before the compilers gets invoked
$(OBJS): gen/config.h
Expand Down Expand Up @@ -344,16 +344,7 @@ DEPFLAGS = -MQ "$@" -MMD -MP -MF $(DEPFILE)
COMPILE=$(LIBTOOL) --mode=compile $(CC)

# Build rule for C source files
# Disabled for HPC-GAP, to ensure we always use the output of ward
# and not the original source files
ifeq ($(HPCGAP),no)
obj/%.lo: src/%.c cnf/GAP-CFLAGS cnf/GAP-CPPFLAGS libtool
@$(MKDIR_P) $(@D)/$(DEPDIRNAME)
$(QUIET_CC)$(COMPILE) $(DEPFLAGS) $(GAP_CFLAGS) $(GAP_CPPFLAGS) -c $< -o $@
endif

# Build rule for generated C source files
obj/%.lo: gen/%.c cnf/GAP-CFLAGS cnf/GAP-CPPFLAGS libtool
obj/%.lo: %.c cnf/GAP-CFLAGS cnf/GAP-CPPFLAGS libtool
@$(MKDIR_P) $(@D)/$(DEPDIRNAME)
$(QUIET_CC)$(COMPILE) $(DEPFLAGS) $(GAP_CFLAGS) $(GAP_CPPFLAGS) -c $< -o $@

Expand Down
2 changes: 1 addition & 1 deletion cnf/gac.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ if [ $comp_howfar = "link" ]; then
if [ "X${output}" = "X" ]; then output="gacout"; fi

for object in $GAP_OBJS; do
if [ ${object} != "obj/compstat.lo" ]; then
if [ ${object} != "obj/src/compstat.lo" ]; then
objects="${abs_top_builddir}/${object} ${objects}"
fi
done
Expand Down