From fac4f6ecc15e119e208188ce320dd3894151e39b Mon Sep 17 00:00:00 2001 From: Steve Arnold Date: Wed, 9 Dec 2015 08:12:15 -0800 Subject: [PATCH] minor makefile updates and one LFLAGS fix --- cccc/posixgcc.mak | 5 ++++- makefile | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cccc/posixgcc.mak b/cccc/posixgcc.mak index 302a7bd..f575de0 100644 --- a/cccc/posixgcc.mak +++ b/cccc/posixgcc.mak @@ -19,6 +19,9 @@ # support for debugging ifeq "$(DEBUG)" "true" DEBUG_FLAGS = -g +DEBUG_LFLAGS = -Wl,$(DEBUG_FLAGS) +else +DEBUG_LFLAGS = endif PATHSEP=/ @@ -27,7 +30,7 @@ CCC ?= g++ INCLUDES = -I../pccts/h CCC_OPTS = -c $(CFLAGS) $(DEBUG_FLAGS) $(INCLUDES) -std=c++98 -x c++ C_OFLAG = -o -LD_OPTS = $(LDFLAGS) -Wl,$(DEBUG_FLAGS) +LD_OPTS = $(LDFLAGS) $(DEBUG_LFLAGS) LD_OFLAG = -o OBJEXT = o CCCC_EXE = cccc diff --git a/makefile b/makefile index 22a7940..73702df 100644 --- a/makefile +++ b/makefile @@ -35,13 +35,13 @@ GENSRC = cccc/CLexer.cpp \ all : mini cccc test mini : - cd pccts && $(MAKE) DEBUG=$(DEBUG) -Orecurse antlr dlg || exit $$? + $(MAKE) DEBUG=$(DEBUG) -C pccts -Orecurse antlr dlg || exit $$? pccts : - cd pccts && $(MAKE) DEBUG=$(DEBUG) -Orecurse $@ || exit $$? + $(MAKE) DEBUG=$(DEBUG) -C pccts -Orecurse $@ || exit $$? cccc : mini - cd cccc && $(MAKE) DEBUG=$(DEBUG) -Orecurse -f posixgcc.mak $@ || exit $$? + $(MAKE) DEBUG=$(DEBUG) -C cccc -f posixgcc.mak $@ || exit $$? .NOTPARALLEL: cccc test test :