update makefiles for ddmd

Author: MartinNowak

src/posix.mak

@@ -145,9 +145,10 @@ endif
 ifdef ENABLE_DEBUG
 CFLAGS += -g -g3 -DDEBUG=1 -DUNITTEST
 DFLAGS += -g -debug
-else
+endif
+ifdef ENABLE_RELEASE
 CFLAGS += -O2
-DFLAGS += -O -inline
+DFLAGS += -O -release -inline
 endif
 ifdef ENABLE_PROFILING
 CFLAGS  += -pg -fprofile-arcs -ftest-coverage
@@ -176,39 +177,25 @@ D_OBJC := 1
 endif
 endif
 
-DMD_OBJS = \
-	access.o attrib.o \
-	cast.o \
-	class.o \
-	constfold.o cond.o \
-	declaration.o dsymbol.o \
-	enum.o expression.o func.o nogc.o \
-	id.o \
-	identifier.o impcnvtab.o import.o inifile.o init.o inline.o \
-	lexer.o link.o mangle.o mars.o module.o mtype.o \
-	cppmangle.o opover.o optimize.o \
-	parse.o scope.o statement.o \
-	struct.o template.o \
-	version.o utf.o staticassert.o \
-	entity.o doc.o macro.o \
-	hdrgen.o delegatize.o interpret.o traits.o \
-	builtin.o ctfeexpr.o clone.o aliasthis.o \
-	arrayop.o json.o unittests.o \
-	imphint.o argtypes.o apply.o sapply.o sideeffect.o \
-	intrange.o canthrow.o target.o nspace.o errors.o \
-	escape.o tokens.o globals.o
+
+DMD_SRCS=$(addsuffix .d,access aggregate aliasthis apply argtypes arrayop	\
+	arraytypes attrib backend builtin canthrow clone complex cond constfold	\
+	cppmangle ctfeexpr dcast dclass declaration delegatize denum dimport	\
+	dinifile dinterpret dmacro dmangle dmodule doc dscope dstruct dsymbol	\
+	dtemplate dunittest dversion entity errors escape expression func	\
+	globals hdrgen id identifier impcnvtab imphint init inline intrange	\
+	json lexer lib link mars mtype nogc nspace opover optimize parse sapply	\
+	sideeffect statement staticassert target tokens traits utf visitor)
 
 ifeq ($(D_OBJC),1)
-	DMD_OBJS += objc.o
+	DMD_SRCS += objc.d
 else
-	DMD_OBJS += objc_stubs.o
+	DMD_SRCS += objc_stubs.d
 endif
 
-ROOT_OBJS = \
-	rmem.o port.o man.o stringtable.o response.o \
-	aav.o speller.o outbuffer.o object.o \
-	filename.o file.o async.o checkedint.o \
-	newdelete.o
+ROOT_SRCS = $(addsuffix .d,$(addprefix $(ROOT)/,aav array file filename		\
+		longdouble man outbuffer port response rmem rootobject speller	\
+		stringtable))
 
 GLUE_OBJS = \
 	glue.o msc.o s2ir.o todt.o e2ir.o tocsym.o \
@@ -248,43 +235,17 @@ else
 	BACK_OBJS += elfobj.o
 endif
 
-SRC = win32.mak posix.mak osmodel.mak \
-	mars.c enum.c struct.c dsymbol.c import.c idgen.d impcnvgen.c \
-	identifier.c mtype.c expression.c optimize.c template.h \
-	template.c lexer.c declaration.c cast.c cond.h cond.c link.c \
-	aggregate.h parse.c statement.c constfold.c version.h version.c \
-	inifile.c module.c scope.c init.h init.c attrib.h \
-	attrib.c opover.c class.c mangle.c func.c nogc.c inline.c \
-	access.c complex_t.h \
-	identifier.h parse.h \
-	scope.h enum.h import.h mars.h module.h mtype.h dsymbol.h \
-	declaration.h lexer.h expression.h statement.h \
-	utf.h utf.c staticassert.h staticassert.c \
-	entity.c \
-	doc.h doc.c macro.h macro.c hdrgen.h hdrgen.c arraytypes.h \
-	delegatize.c interpret.c traits.c cppmangle.c \
-	builtin.c clone.c lib.h arrayop.c \
-	aliasthis.h aliasthis.c json.h json.c unittests.c imphint.c \
-	argtypes.c apply.c sapply.c sideeffect.c \
-	intrange.h intrange.c canthrow.c target.c target.h \
-	scanmscoff.c scanomf.c ctfe.h ctfeexpr.c \
-	ctfe.h ctfeexpr.c visitor.h nspace.h nspace.c errors.h errors.c \
-	escape.c tokens.h tokens.c globals.h globals.c objc.c objc.h objc_stubs.c
-
-ROOT_SRC = $(ROOT)/root.h \
-	$(ROOT)/array.h \
-	$(ROOT)/rmem.h $(ROOT)/rmem.c $(ROOT)/port.h $(ROOT)/port.c \
-	$(ROOT)/man.c $(ROOT)/newdelete.c \
-	$(ROOT)/checkedint.h $(ROOT)/checkedint.c \
-	$(ROOT)/stringtable.h $(ROOT)/stringtable.c \
-	$(ROOT)/response.c $(ROOT)/async.h $(ROOT)/async.c \
-	$(ROOT)/aav.h $(ROOT)/aav.c \
-	$(ROOT)/longdouble.h $(ROOT)/longdouble.c \
-	$(ROOT)/speller.h $(ROOT)/speller.c \
-	$(ROOT)/outbuffer.h $(ROOT)/outbuffer.c \
-	$(ROOT)/object.h $(ROOT)/object.c \
-	$(ROOT)/filename.h $(ROOT)/filename.c \
-	$(ROOT)/file.h $(ROOT)/file.c
+SRC = win32.mak posix.mak osmodel.mak aggregate.h aliasthis.h arraytypes.h	\
+	attrib.h complex_t.h cond.h ctfe.h ctfe.h declaration.h doc.h dsymbol.h	\
+	enum.h errors.h expression.h globals.h hdrgen.h identifier.h idgen.d	\
+	impcnvgen.c import.h init.h intrange.h json.h lexer.h lib.h macro.h	\
+	mars.h module.h mtype.h nspace.h objc.h parse.h scanmscoff.c scanomf.c	\
+	scope.h statement.h staticassert.h target.h template.h tokens.h utf.h	\
+	version.h visitor.h $(DMD_SRCS)
+
+ROOT_SRC = $(addprefix $(ROOT)/,aav.h array.h checkedint.c checkedint.h file.h	\
+	filename.h longdouble.c longdouble.h newdelete.c object.c object.h	\
+	outbuffer.h port.h rmem.c rmem.h root.h speller.h stringtable.h)
 
 GLUE_SRC = glue.c msc.c s2ir.c todt.c e2ir.c tocsym.c \
 	toobj.c toctype.c tocvdebug.c toir.h toir.c \
@@ -319,39 +280,32 @@ TK_SRC = \
 	$(TK)/filespec.h $(TK)/mem.h $(TK)/list.h $(TK)/vec.h \
 	$(TK)/filespec.c $(TK)/mem.c $(TK)/vec.c $(TK)/list.c
 
-DEPS = $(patsubst %.o,%.deps,$(DMD_OBJS) $(ROOT_OBJS) $(GLUE_OBJS) $(BACK_OBJS))
+DEPS = $(patsubst %.o,%.deps,$(DMD_OBJS) $(GLUE_OBJS) $(BACK_OBJS))
 
 all: dmd
 
-auto-tester-build: dmd checkwhitespace ddmd
+auto-tester-build: dmd checkwhitespace
 .PHONY: auto-tester-build
 
-frontend.a: $(DMD_OBJS)
-	$(AR) rcs frontend.a $(DMD_OBJS)
-
-root.a: $(ROOT_OBJS)
-	$(AR) rcs root.a $(ROOT_OBJS)
-
 glue.a: $(GLUE_OBJS)
 	$(AR) rcs glue.a $(GLUE_OBJS)
 
 backend.a: $(BACK_OBJS)
 	$(AR) rcs backend.a $(BACK_OBJS)
 
 ifdef ENABLE_LTO
-dmd: $(DMD_OBJS) $(ROOT_OBJS) $(GLUE_OBJS) $(BACK_OBJS)
-	$(HOST_CC) -o dmd $(MODEL_FLAG) $^ $(LDFLAGS)
+dmd: $(DMD_SRCS) $(ROOT_SRCS) newdelete.o $(GLUE_OBJS) $(BACK_OBJS) verstr.h
+	CC=$(HOST_CC) $(HOST_DMD_RUN) -of$@ $(MODEL_FLAG) -vtls -J. -d $(DFLAGS) $(filter-out verstr.h,$^)
 else
-dmd: frontend.a root.a glue.a backend.a
-	$(HOST_CC) -o dmd $(MODEL_FLAG) frontend.a root.a glue.a backend.a $(LDFLAGS)
+dmd: $(DMD_SRCS) $(ROOT_SRCS) newdelete.o glue.a backend.a verstr.h
+	CC=$(HOST_CC) $(HOST_DMD_RUN) -of$@ $(MODEL_FLAG) -vtls -J. -d $(DFLAGS) $(filter-out verstr.h,$^)
 endif
 
 clean:
-	rm -f $(DMD_OBJS) $(ROOT_OBJS) $(GLUE_OBJS) $(BACK_OBJS) dmd optab.o id.o impcnvgen idgen id.c id.h \
-		impcnvtab.d id.d impcnvtab.c optabgen debtab.c optab.c cdxxx.c elxxx.c fltables.c \
-		tytab.c verstr.h core \
-		*.cov *.deps *.gcda *.gcno *.a \
-		$(GENSRC) $(MAGICPORT)
+	rm -f $(GLUE_OBJS) $(BACK_OBJS) dmd optab.o id.o impcnvgen idgen id.d id.h \
+		impcnvtab.{c,d} optabgen debtab.c optab.c cdxxx.c elxxx.c fltables.c \
+		tytab.c git.ver core \
+		*.cov *.deps *.gcda *.gcno *.a
 	@[ ! -d ${PGO_DIR} ] || echo You should issue manually: rm -rf ${PGO_DIR}
 
 ######## Download and install the last dmd buildable without dmd
@@ -429,7 +383,7 @@ $(shell test \"$(VERSION)\" != "`cat verstr.h 2> /dev/null`" \
 
 #########
 
-$(DMD_OBJS) $(GLUE_OBJS) : $(idgen_output) $(impcnvgen_output)
+$(GLUE_OBJS) : $(idgen_output) $(impcnvgen_output)
 $(BACK_OBJS) : $(optabgen_output)
 
 
@@ -450,8 +404,6 @@ iasm.o: CFLAGS += -fexceptions
 
 inifile.o: CFLAGS += -DSYSCONFDIR='"$(SYSCONFDIR)"'
 
-mars.o: verstr.h
-
 var.o: optab.c tytab.c
 
 
@@ -461,10 +413,6 @@ var.o: optab.c tytab.c
 # matching below.
 vpath %.c $(C)
 
-$(DMD_OBJS): %.o: %.c posix.mak
-	@echo "  (CC)  DMD_OBJS   $<"
-	$(CC) -c $(CFLAGS) $(DMD_FLAGS) $(MMD) $<
-
 $(BACK_OBJS): %.o: %.c posix.mak
 	@echo "  (CC)  BACK_OBJS  $<"
 	$(CC) -c $(CFLAGS) $(BACK_FLAGS) $(MMD) $<
@@ -473,7 +421,7 @@ $(GLUE_OBJS): %.o: %.c posix.mak
 	@echo "  (CC)  GLUE_OBJS  $<"
 	$(CC) -c $(CFLAGS) $(GLUE_FLAGS) $(MMD) $<
 
-$(ROOT_OBJS): %.o: $(ROOT)/%.c posix.mak
+newdelete.o: %.o: $(ROOT)/%.c posix.mak
 	@echo "  (CC)  ROOT_OBJS  $<"
 	$(CC) -c $(CFLAGS) $(ROOT_FLAGS) $(MMD) $<
 
@@ -492,185 +440,25 @@ install: all
 
 ######################################################
 
-checkwhitespace:
-	CC=$(HOST_CC) $(HOST_DMD_RUN) -run checkwhitespace $(SRC) $(GLUE_SRC) $(ROOT_SRC)
+checkwhitespace: $(HOST_DC)
+	CC=$(HOST_CC) $(HOST_DC_RUN) -run checkwhitespace $(SRC) $(GLUE_SRC) $(ROOT_SRCS)
 
 ######################################################
 
 gcov:
-	gcov access.c
-	gcov aliasthis.c
-	gcov apply.c
-	gcov arrayop.c
-	gcov attrib.c
-	gcov builtin.c
-	gcov canthrow.c
-	gcov cast.c
-	gcov class.c
-	gcov clone.c
-	gcov cond.c
-	gcov constfold.c
-	gcov declaration.c
-	gcov delegatize.c
-	gcov doc.c
-	gcov dsymbol.c
-	gcov e2ir.c
-	gcov eh.c
-	gcov entity.c
-	gcov enum.c
-	gcov expression.c
-	gcov func.c
-	gcov nogc.c
-	gcov glue.c
-	gcov iasm.c
-	gcov identifier.c
-	gcov imphint.c
-	gcov import.c
-	gcov inifile.c
-	gcov init.c
-	gcov inline.c
-	gcov interpret.c
-	gcov ctfeexpr.c
-	gcov irstate.c
-	gcov json.c
-	gcov lexer.c
-ifeq (osx,$(OS))
-	gcov libmach.c
-else
-	gcov libelf.c
-endif
-	gcov link.c
-	gcov macro.c
-	gcov mangle.c
-	gcov mars.c
-	gcov module.c
-	gcov msc.c
-	gcov mtype.c
-	gcov nspace.c
-ifeq ($(D_OBJC),1)
-	gcov objc.c
-	gcov objc_glue.c
-else
-	gcov objc_stubs.c
-	gcov objc_glue_stubs.c
-endif
-	gcov opover.c
-	gcov optimize.c
-	gcov parse.c
-	gcov scope.c
-	gcov sideeffect.c
-	gcov statement.c
-	gcov staticassert.c
-	gcov s2ir.c
-	gcov struct.c
-	gcov template.c
-	gcov tk.c
-	gcov tocsym.c
-	gcov todt.c
-	gcov toobj.c
-	gcov toctype.c
-	gcov toelfdebug.c
-	gcov typinf.c
-	gcov utf.c
-	gcov version.c
-	gcov intrange.c
-	gcov target.c
-
-#	gcov hdrgen.c
-#	gcov tocvdebug.c
+	gcov $(filter %.c,$(SRC) $(GLUE_SRC))
 
 ######################################################
 
 zip:
 	-rm -f dmdsrc.zip
-	zip dmdsrc $(SRC) $(ROOT_SRC) $(GLUE_SRC) $(BACK_SRC) $(TK_SRC)
+	zip dmdsrc $(SRC) $(ROOT_SRCS) $(GLUE_SRC) $(BACK_SRC) $(TK_SRC)
 
 ######################################################
 
 ../changelog.html: ../changelog.dd
 	$(HOST_DMD_RUN) -Df$@ $<
 
-############################# DDMD stuff ############################
-
-MAGICPORTDIR = magicport
-MAGICPORTSRC = \
-	$(MAGICPORTDIR)/magicport2.d $(MAGICPORTDIR)/ast.d \
-	$(MAGICPORTDIR)/scanner.d $(MAGICPORTDIR)/tokens.d \
-	$(MAGICPORTDIR)/parser.d $(MAGICPORTDIR)/dprinter.d \
-	$(MAGICPORTDIR)/typenames.d $(MAGICPORTDIR)/visitor.d \
-	$(MAGICPORTDIR)/namer.d
-
-MAGICPORT = $(MAGICPORTDIR)/magicport2
-
-$(MAGICPORT) : $(MAGICPORTSRC)
-	CC=$(HOST_CC) $(HOST_DMD_RUN) -of$(MAGICPORT) $(MAGICPORTSRC)
-
-GENSRC=access.d aggregate.d aliasthis.d apply.d \
-	argtypes.d arrayop.d arraytypes.d \
-	attrib.d builtin.d canthrow.d dcast.d \
-	dclass.d clone.d cond.d constfold.d \
-	cppmangle.d ctfeexpr.d declaration.d \
-	delegatize.d doc.d dsymbol.d \
-	denum.d expression.d func.d \
-	hdrgen.d identifier.d imphint.d \
-	dimport.d dinifile.d inline.d init.d \
-	dinterpret.d json.d lexer.d link.d \
-	dmacro.d dmangle.d mars.d \
-	dmodule.d mtype.d opover.d optimize.d \
-	parse.d sapply.d dscope.d sideeffect.d \
-	statement.d staticassert.d dstruct.d \
-	target.d dtemplate.d traits.d dunittest.d \
-	utf.d dversion.d visitor.d lib.d \
-	nogc.d nspace.d errors.d tokens.d \
-	globals.d escape.d \
-	$(ROOT)/aav.d $(ROOT)/outbuffer.d $(ROOT)/stringtable.d \
-	$(ROOT)/file.d $(ROOT)/filename.d $(ROOT)/speller.d \
-	$(ROOT)/man.d $(ROOT)/response.d
-
-MANUALSRC= \
-	intrange.d complex.d \
-	entity.d backend.d \
-	$(ROOT)/array.d $(ROOT)/longdouble.d \
-	$(ROOT)/rootobject.d $(ROOT)/port.d \
-	$(ROOT)/rmem.d id.d impcnvtab.d
-
-ifeq ($(D_OBJC),1)
-	GENSRC += objc.d
-else
-	MANUALSRC += objc_stubs.d
-endif
-
-mars.d : $(SRC) $(ROOT_SRC) magicport.json $(MAGICPORT)
-	$(MAGICPORT) . .
-
-DSRC= $(GENSRC) $(MANUALSRC)
-
-ddmd: mars.d $(MANUALSRC) newdelete.o glue.a backend.a verstr.h
-	CC=$(HOST_CC) $(HOST_DMD_RUN) $(MODEL_FLAG) $(DSRC) -ofddmd newdelete.o glue.a backend.a -vtls -J. -d $(DFLAGS)
-
-DELSRCS=access.c aliasthis.c apply.c argtypes.c arrayop.c attrib.c builtin.c	\
-	canthrow.c cast.c class.c clone.c cond.c constfold.c cppmangle.c	\
-	ctfeexpr.c declaration.c delegatize.c doc.c dsymbol.c entity.c enum.c	\
-	errors.c escape.c expression.c func.c globals.c hdrgen.c identifier.c	\
-	imphint.c import.c inifile.c init.c inline.c interpret.c intrange.c	\
-	json.c lexer.c link.c macro.c mangle.c mars.c module.c mtype.c nogc.c	\
-	nspace.c objc.c objc_stubs.c opover.c optimize.c parse.c sapply.c	\
-	scope.c sideeffect.c statement.c staticassert.c struct.c target.c	\
-	template.c tokens.c traits.c unittests.c utf.c version.c $(addprefix	\
-	$(ROOT)/,aav.c async.c async.h checkedint.c checkedint.h file.c		\
-	filename.c longdouble.c man.c object.c outbuffer.c port.c response.c	\
-	rmem.c speller.c stringtable.c)
-
-convert_tree : $(SRC) $(ROOT_SRC) magicport.json $(MAGICPORT)
-	$(MAGICPORT) . .
-	rm $(DELSRCS)
-	rm $(MAGICPORT) $(MAGICPORTDIR)/*.o
-
-convert_index : $(SRC) $(ROOT_SRC) magicport.json $(MAGICPORT)
-	$(MAGICPORT) . .
-	git add $(GENSRC) objc.d
-	git rm $(DELSRCS)
-
 #############################
 
 .DELETE_ON_ERROR: # GNU Make directive (delete output files on error)