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.

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

Merge build systems in the byterun directory #981

Merged
merged 24 commits into from Dec 29, 2016
Commits
Jump to file or symbol
Failed to load files and symbols.
+8 −9
Diff settings

Always

Just for now

Viewing a subset of changes. View all

Simplify the way the list of object files is defined

  • Loading branch information...
shindere committed Dec 27, 2016
commit 05564d12a41437beb3e9bc8eb57ca372c2983973
View
@@ -72,22 +72,21 @@ OUTPUTOBJ=-o
endif
DBGO=d.$(O)
COMMONOBJS=$(addsuffix .$(O), \
PRIMS=\
alloc.c array.c compare.c extern.c floats.c gc_ctrl.c hash.c \
intern.c interp.c ints.c io.c lexing.c md5.c meta.c obj.c parsing.c \
signals.c str.c sys.c terminfo.c callback.c weak.c finalise.c stacks.c \
dynlink.c backtrace_prim.c backtrace.c spacetime.c afl.c
OBJS=$(addsuffix .$(O), \
interp misc stacks fix_code startup_aux startup \
freelist major_gc minor_gc memory alloc roots globroots \
fail signals signals_byt printexc backtrace_prim backtrace \
compare ints floats str array io extern intern \
hash sys meta parsing gc_ctrl terminfo md5 obj \
lexing callback debugger weak compact finalise custom \
dynlink spacetime afl)
PRIMS=\
alloc.c array.c compare.c extern.c floats.c gc_ctrl.c hash.c \
intern.c interp.c ints.c io.c lexing.c md5.c meta.c obj.c parsing.c \
signals.c str.c sys.c terminfo.c callback.c weak.c finalise.c stacks.c \
dynlink.c backtrace_prim.c backtrace.c spacetime.c afl.c
dynlink spacetime afl $(UNIX_OR_WIN32) main)
OBJS=$(COMMONOBJS) $(UNIX_OR_WIN32).$(O) main.$(O)
DOBJS=$(OBJS:.$(O)=.$(DBGO)) instrtrace.$(DBGO)
IOBJS=$(OBJS:.$(O)=.i.$(O))
PICOBJS=$(OBJS:.$(O)=.pic.$(O))
ProTip! Use n and p to navigate between commits in a pull request.