diff options
author | Patrick Lehmann <Patrick.Lehmann@tu-dresden.de> | 2016-07-26 18:55:25 +0200 |
---|---|---|
committer | tgingold <tgingold@users.noreply.github.com> | 2016-07-26 18:55:25 +0200 |
commit | 7776856c175ed776c7606ad48f8170dcb79243a9 (patch) | |
tree | 4db3ada6bdbf22dcce8296978b3a323df132a30f | |
parent | 07cdfc14b94fa48feb15e564b57afb498fff308a (diff) | |
download | ghdl-7776856c175ed776c7606ad48f8170dcb79243a9.tar.gz ghdl-7776856c175ed776c7606ad48f8170dcb79243a9.tar.bz2 ghdl-7776856c175ed776c7606ad48f8170dcb79243a9.zip |
Makefiles changes for $(EXEEXT) - please review. (#119)
* Makefiles changes for $(EXEEXT) - please review.
* Moved $(EXEEXT).
-rw-r--r-- | Makefile.in | 54 | ||||
-rw-r--r-- | src/ghdldrv/Makefile | 58 | ||||
-rw-r--r-- | src/grt/Makefile | 2 |
3 files changed, 57 insertions, 57 deletions
diff --git a/Makefile.in b/Makefile.in index 0e845f375..bea6e4744 100644 --- a/Makefile.in +++ b/Makefile.in @@ -98,12 +98,12 @@ include $(GRTSRCDIR)/Makefile.inc #################### For mcode backend ############################## -all.mcode: ghdl_mcode libs.vhdl.mcode all.vpi +all.mcode: ghdl_mcode$(EXEEXT) libs.vhdl.mcode all.vpi GHDL_MCODE_INCFLAGS=$(GHDL_COMMON_INCFLAGS) -aI$(srcdir)/src/ghdldrv -aI$(srcdir)/src/grt -aI$(srcdir)/src/ortho -aI$(srcdir)/src/ortho/mcode -ghdl_mcode: GRT_FLAGS+=-DWITH_GNAT_RUN_TIME -ghdl_mcode: $(GRT_ADD_OBJS) $(GRT_SRC_DEPS) $(ORTHO_DEPS) \ +ghdl_mcode$(EXEEXT): GRT_FLAGS+=-DWITH_GNAT_RUN_TIME +ghdl_mcode$(EXEEXT): $(GRT_ADD_OBJS) $(GRT_SRC_DEPS) $(ORTHO_DEPS) \ memsegs_c.o chkstk.o force $(GNATMAKE) -o $@ $(GHDL_MCODE_INCFLAGS) $(GNATFLAGS) -gnatw.A ghdl_jit.adb $(GNAT_BARGS) -largs memsegs_c.o chkstk.o $(GNAT_LARGS) $(GRT_ADD_OBJS) $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB)) @@ -112,12 +112,12 @@ memsegs_c.o: $(srcdir)/src/ortho/mcode/memsegs_c.c libs.vhdl.mcode: vhdl.libs.all -install.mcode.program: install.dirs ghdl_mcode - $(INSTALL_PROGRAM) ghdl_mcode $(DESTDIR)$(bindir)/ghdl +install.mcode.program: install.dirs ghdl_mcode$(EXEEXT) + $(INSTALL_PROGRAM) ghdl_mcode$(EXEEXT) $(DESTDIR)$(bindir)/ghdl$(EXEEXT) install.mcode: install.mcode.program install.vhdllib install.vpi -oread-mcode: force +oread-mcode$(EXEEXT): force $(MAKE) -f $(srcdir)/src/ortho/mcode/Makefile \ ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \ GNAT_FLAGS="-aI$(srcdir)/src/ortho/oread $(GNATFLAGS)" all @@ -153,7 +153,7 @@ copy-sources.gcc: $(CP) -p $(srcdir)/dist/gcc/lang-specs.h $(gcc_vhdl_dir) libs.vhdl.gcc: - $(MAKE) GHDL=$(bindir)/ghdl vhdl.libs.all libs.vhdl.standard + $(MAKE) GHDL=$(bindir)/ghdl$(EXEEXT) vhdl.libs.all libs.vhdl.standard ghdllib: libs.vhdl.gcc libgrt.a @@ -161,12 +161,12 @@ install.gcc: install.vhdllib install.grt install.vpi GHDL_GCC_INCFLAGS=$(GHDL_COMMON_INCFLAGS) -ghdl1-gcc: force +ghdl1-gcc$(EXEEXT): force $(MAKE) -f $(srcdir)/src/ortho/gcc/Makefile \ ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \ GNAT_FLAGS="$(GHDL_GCC_INCFLAGS) $(GNATFLAGS)" all -ghdl_gcc: force +ghdl_gcc$(EXEEXT): force $(GNATMAKE) $(GHDL_GCC_INCFLAGS) -aI$(srcdir)/src/ghdldrv \ $(GNATFLAGS) ghdl_gcc $(GNAT_BARGS) -largs $(GNAT_LARGS) @@ -179,15 +179,15 @@ grt.links: ln -sf $(libdirreverse)/libbacktrace.a .; \ fi -libs.vhdl.local_gcc: ghdl_gcc ghdl1-gcc vhdl.libs.all libs.vhdl.standard +libs.vhdl.local_gcc: ghdl_gcc$(EXEEXT) ghdl1-gcc$(EXEEXT) vhdl.libs.all libs.vhdl.standard -ghdl1-debug: force +ghdl1-debug$(EXEEXT): force $(MAKE) -f $(srcdir)/src/ortho/debug/Makefile \ ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \ GNAT_FLAGS="$(GHDL_GCC_INCFLAGS) $(GNATFLAGS)" \ GNATMAKE="$(GNATMAKE)" all -oread-gcc: force +oread-gcc$(EXEEXT): force $(MAKE) -f $(srcdir)/src/ortho/gcc/Makefile \ ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \ GNAT_FLAGS="-aI$(srcdir)/src/ortho/oread $(GNATFLAGS)" all @@ -196,12 +196,12 @@ oread-gcc: force GHDL_LLVM_INCFLAGS=$(GHDL_COMMON_INCFLAGS) -aI$(srcdir)/src/ghdldrv -aI$(srcdir)/src/grt -aI$(srcdir)/src/ortho -aI$(srcdir)/src/ortho/llvm -all.llvm: ghdl1-llvm ghdl_llvm grt-all libs.vhdl.llvm all.vpi +all.llvm: ghdl1-llvm$(EXEEXT) ghdl_llvm$(EXEEXT) grt-all libs.vhdl.llvm all.vpi -all.llvm_jit: ghdl_llvm_jit +all.llvm_jit: ghdl_llvm_jit$(EXEEXT) -ghdl_llvm_jit: GRT_FLAGS+=-DWITH_GNAT_RUN_TIME -ghdl_llvm_jit: $(GRT_ADD_OBJS) $(GRT_SRC_DEPS) $(ORTHO_DEPS) \ +ghdl_llvm_jit$(EXEEXT): GRT_FLAGS+=-DWITH_GNAT_RUN_TIME +ghdl_llvm_jit$(EXEEXT): $(GRT_ADD_OBJS) $(GRT_SRC_DEPS) $(ORTHO_DEPS) \ llvm-cbindings.o force $(GNATMAKE) -o $@ $(GHDL_LLVM_INCFLAGS) $(GNATFLAGS) ghdl_jit.adb \ $(GNAT_BARGS) -largs llvm-cbindings.o $(GNAT_LARGS) $(GRT_ADD_OBJS) \ @@ -212,30 +212,30 @@ llvm-cbindings.o: $(srcdir)/src/ortho/llvm/llvm-cbindings.cpp $(CXX) -c `$(LLVM_CONFIG) --includedir --cxxflags` \ $(OPT_FLAGS) -o $@ $< -libs.vhdl.llvmjit: ghdl_llvm_jit - $(MAKE) GHDL=$(PWD)/ghdl_llvm_jit vhdl.libs.all +libs.vhdl.llvmjit: ghdl_llvm_jit$(EXEEXT) + $(MAKE) GHDL=$(PWD)/ghdl_llvm_jit$(EXEEXT) vhdl.libs.all -libs.vhdl.llvm: ghdl_llvm ghdl1-llvm - $(MAKE) GHDL=$(PWD)/ghdl_llvm ANALYZE_OPTS="--GHDL1=ghdl1-llvm$(EXEEXT)" vhdl.libs.all libs.vhdl.standard +libs.vhdl.llvm: ghdl_llvm$(EXEEXT) ghdl1-llvm$(EXEEXT) + $(MAKE) GHDL=$(PWD)/ghdl_llvm$(EXEEXT) ANALYZE_OPTS="--GHDL1=ghdl1-llvm$(EXEEXT)" vhdl.libs.all libs.vhdl.standard -ghdl_llvm: force +ghdl_llvm$(EXEEXT): force $(GNATMAKE) $(GHDL_LLVM_INCFLAGS) -aI$(srcdir)/src/ghdldrv $(GNATFLAGS)\ ghdl_llvm $(GNAT_BARGS) -largs $(GNAT_LARGS) -ghdl1-llvm: force +ghdl1-llvm$(EXEEXT): force $(MAKE) -f $(srcdir)/src/ortho/llvm/Makefile \ ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \ GNAT_FLAGS="$(GHDL_LLVM_INCFLAGS) $(GNATFLAGS)" LDFLAGS="$(LDFLAGS)" \ LLVM_CONFIG="$(LLVM_CONFIG)" all -oread-llvm: force +oread-llvm$(EXEEXT): force $(MAKE) -f $(srcdir)/src/ortho/llvm/Makefile \ ortho_srcdir=$(srcdir)/src/ortho ortho_exec=$@ \ GNATMAKE="$(GNATMAKE)" \ GNAT_FLAGS="-aI$(srcdir)/src/ortho/oread $(GNATFLAGS)" \ LLVM_CONFIG="$(LLVM_CONFIG)" -install.llvm.program: install.dirs ghdl1-llvm ghdl_llvm +install.llvm.program: install.dirs ghdl1-llvm$(EXEEXT) ghdl_llvm$(EXEEXT) $(INSTALL_PROGRAM) ghdl_llvm$(EXEEXT) $(DESTDIR)$(bindir)/ghdl$(EXEEXT) $(INSTALL_PROGRAM) ghdl1-llvm$(EXEEXT) $(DESTDIR)$(bindir)/ghdl1-llvm$(EXEEXT) @@ -245,10 +245,10 @@ install.llvm: install.llvm.program install.vhdllib install.grt install.vpi GHDL_SIMUL_INCFLAGS=$(GHDL_COMMON_INCFLAGS) -aI$(srcdir)/src/ghdldrv -aI$(srcdir)/src/vhdl/simulate -aI$(srcdir)/src/grt -ghdl_simul: $(GRT_ADD_OBJS) $(GRT_SRC_DEPS) force +ghdl_simul$(EXEEXT): $(GRT_ADD_OBJS) $(GRT_SRC_DEPS) force $(GNATMAKE) $(GHDL_SIMUL_INCFLAGS) $(GNATFLAGS) ghdl_simul $(GNAT_BARGS) -largs $(GNAT_LARGS) $(GRT_ADD_OBJS) $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB)) -libs.vhdl.simul: ghdl_simul vhdl.libs.all +libs.vhdl.simul: ghdl_simul$(EXEEXT) vhdl.libs.all ################ mhdlsim (library for the vhdl part) #################### @@ -309,7 +309,7 @@ install.vpi: all.vpi install.dirs LIBSRC_DIR:=$(srcdir)/libraries LIBDST_DIR:=$(libdirsuffix) -GHDL=$(PWD)/ghdl_$(backend) +GHDL=$(PWD)/ghdl_$(backend)$(EXEEXT) ANALYZE_OPTS:= ANALYZE:=$(GHDL) -a $(ANALYZE_OPTS) $(LIB_CFLAGS) ANALYZE_DEP:=$(GHDL) diff --git a/src/ghdldrv/Makefile b/src/ghdldrv/Makefile index ebf23c2d1..b900fca39 100644 --- a/src/ghdldrv/Makefile +++ b/src/ghdldrv/Makefile @@ -37,7 +37,7 @@ GNAT_BARGS=-bargs -E LLVM_CONFIG=llvm-config #GNAT_LARGS= -static -all: ghdl_mcode +all: ghdl_mcode$(EXEEXT) target=i686-pc-linux-gnu #target=x86_64-pc-linux-gnu @@ -64,46 +64,46 @@ ortho_code-x86-flags.ads: echo "with Ortho_Code.X86.$(ORTHO_X86_FLAGS);" > $@ echo "package Ortho_Code.X86.Flags renames Ortho_Code.X86.$(ORTHO_X86_FLAGS);" >> $@ -ghdl_mcode: GRT_FLAGS+=-DWITH_GNAT_RUN_TIME -ghdl_mcode: default_pathes.ads $(GRT_ADD_OBJS) $(ORTHO_DEPS) memsegs_c.o chkstk.o force +ghdl_mcode$(EXEEXT): GRT_FLAGS+=-DWITH_GNAT_RUN_TIME +ghdl_mcode$(EXEEXT): default_pathes.ads $(GRT_ADD_OBJS) $(ORTHO_DEPS) memsegs_c.o chkstk.o force $(GNATMAKE) -o $@ -aI../../ortho/mcode -aI../../ortho $(GNATFLAGS) ghdl_jit.adb $(GNAT_BARGS) -largs memsegs_c.o chkstk.o $(GNAT_LARGS) $(GRT_ADD_OBJS) $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB)) memsegs_c.o: ../../ortho/mcode/memsegs_c.c $(CC) -c -g -o $@ $< -ghdl_llvm_jit: GRT_FLAGS+=-DWITH_GNAT_RUN_TIME -ghdl_llvm_jit: default_pathes.ads $(GRT_ADD_OBJS) $(ORTHO_DEPS) llvm-cbindings.o force +ghdl_llvm_jit$(EXEEXT): GRT_FLAGS+=-DWITH_GNAT_RUN_TIME +ghdl_llvm_jit$(EXEEXT): default_pathes.ads $(GRT_ADD_OBJS) $(ORTHO_DEPS) llvm-cbindings.o force $(GNATMAKE) -o $@ -aI../../ortho/llvm -aI../../ortho $(GNATFLAGS) ghdl_jit.adb $(GNAT_BARGS) -largs llvm-cbindings.o $(GNAT_LARGS) $(GRT_ADD_OBJS) $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB)) `$(LLVM_CONFIG) --ldflags --libs --system-libs` -lc++ llvm-cbindings.o: ../../ortho/llvm/llvm-cbindings.cpp $(CXX) -c -m64 `$(LLVM_CONFIG) --includedir --cxxflags` -g -o $@ $< -ghdl_simul: default_pathes.ads $(GRT_ADD_OBJS) force - $(GNATMAKE) -aI../../simulate $(GNATFLAGS) ghdl_simul $(GNAT_BARGS) -largs $(GNAT_LARGS) $(GRT_ADD_OBJS) $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB)) +ghdl_simul$(EXEEXT): default_pathes.ads $(GRT_ADD_OBJS) force + $(GNATMAKE) -aI../../simulate $(GNATFLAGS) ghdl_simul$(EXEEXT) $(GNAT_BARGS) -largs $(GNAT_LARGS) $(GRT_ADD_OBJS) $(subst @,$(GRTSRCDIR),$(GRT_EXTRA_LIB)) -ghdl_gcc: default_pathes.ads force +ghdl_gcc$(EXEEXT): default_pathes.ads force $(GNATMAKE) $(GNATFLAGS) ghdl_gcc $(GNAT_BARGS) -largs $(GNAT_LARGS) -ghdl_llvm: default_pathes.ads force +ghdl_llvm$(EXEEXT): default_pathes.ads force $(GNATMAKE) $(GNATFLAGS) ghdl_llvm $(GNAT_BARGS) -largs $(GNAT_LARGS) default_pathes.ads: default_pathes.ads.in Makefile curdir=`cd ..; pwd`; \ - sed -e "s%@COMPILER_GCC@%$$curdir/ghdl1-gcc%" \ - -e "s%@COMPILER_DEBUG@%$$curdir/ghdl1-debug%" \ - -e "s%@COMPILER_MCODE@%$$curdir/ghdl1-mcode%" \ - -e "s%@COMPILER_LLVM@%$$curdir/ghdl1-llvm%" \ - -e "s%@POST_PROCESSOR@%$$curdir/../ortho/oread/oread-gcc%" \ + sed -e "s%@COMPILER_GCC@%$$curdir/ghdl1-gcc$(EXEEXT)%" \ + -e "s%@COMPILER_DEBUG@%$$curdir/ghdl1-debug$(EXEEXT)%" \ + -e "s%@COMPILER_MCODE@%$$curdir/ghdl1-mcode$(EXEEXT)%" \ + -e "s%@COMPILER_LLVM@%$$curdir/ghdl1-llvm$(EXEEXT)%" \ + -e "s%@POST_PROCESSOR@%$$curdir/../ortho/oread/oread-gcc$(EXEEXT)%" \ -e "s%@INSTALL_PREFIX@%%" \ -e "s%@LIB_PREFIX@%$$curdir/lib/%" < $< > $@ bootstrap.old: force $(RM) ../../libraries/std-obj87.cf $(MAKE) -C ../../libraries EXT=obj \ - ANALYSE="$(PWD)/ghdl -a -g" std-obj87.cf + ANALYSE="$(PWD)/ghdl$(EXEEXT) -a -g" std-obj87.cf $(RM) ../../libraries/std-obj93.cf $(MAKE) -C ../../libraries EXT=obj \ - ANALYSE="$(PWD)/ghdl -a -g" std-obj93.cf + ANALYSE="$(PWD)/ghdl$(EXEEXT) -a -g" std-obj93.cf LIB87_DIR:=../lib/v87 LIB93_DIR:=../lib/v93 @@ -111,7 +111,7 @@ LIB08_DIR:=../lib/v08 LIBSRC_DIR:=../../libraries REL_DIR:=../.. -GHDL=ghdl +GHDL=ghdl$(EXEEXT) ANALYZE:=../../../ghdldrv/$(GHDL) -a $(LIB_CFLAGS) LN=ln -s CP=cp @@ -122,9 +122,9 @@ $(LIB87_DIR) $(LIB93_DIR) $(LIB08_DIR): include ../../libraries/Makefile.inc -GHDL1=../ghdl1-gcc +GHDL1=../ghdl1-gcc$(EXEEXT) $(LIB93_DIR)/std/std_standard.o: $(GHDL1) -ifeq ($(GHDL),ghdl_llvm) +ifeq ($(GHDL),ghdl_llvm$(EXEEXT)) $(GHDL1) --std=93 -quiet $(LIB_CFLAGS) -c -o $@ --compile-standard else $(GHDL1) --std=93 -quiet $(LIB_CFLAGS) -o std_standard.s \ @@ -134,7 +134,7 @@ else endif $(LIB87_DIR)/std/std_standard.o: $(GHDL1) -ifeq ($(GHDL),ghdl_llvm) +ifeq ($(GHDL),ghdl_llvm$(EXEEXT)) $(GHDL1) --std=87 -quiet $(LIB_CFLAGS) -c -o $@ --compile-standard else $(GHDL1) --std=87 -quiet $(LIB_CFLAGS) -o std_standard.s \ @@ -144,7 +144,7 @@ else endif $(LIB08_DIR)/std/std_standard.o: $(GHDL1) -ifeq ($(GHDL),ghdl_llvm) +ifeq ($(GHDL),ghdl_llvm$(EXEEXT)) $(GHDL1) --std=08 -quiet $(LIB_CFLAGS) -c -o $@ --compile-standard else $(GHDL1) --std=08 -quiet $(LIB_CFLAGS) -o std_standard.s \ @@ -167,22 +167,22 @@ grt.links: install.all: install.v87 install.v93 install.v08 install.gcc: - $(MAKE) GHDL=ghdl_gcc install.all - $(MAKE) GHDL1=../ghdl1-gcc install.standard + $(MAKE) GHDL=ghdl_gcc$(EXEEXT) install.all + $(MAKE) GHDL1=../ghdl1-gcc$(EXEEXT) install.standard install.mcode: - $(MAKE) GHDL=ghdl_mcode install.all + $(MAKE) GHDL=ghdl_mcode$(EXEEXT) install.all install.simul: - $(MAKE) GHDL=ghdl_simul install.all + $(MAKE) GHDL=ghdl_simul$(EXEEXT) install.all install.llvm: - $(MAKE) GHDL=ghdl_llvm install.all - $(MAKE) GHDL1=../ghdl1-llvm install.standard + $(MAKE) GHDL=ghdl_llvm$(EXEEXT) install.all + $(MAKE) GHDL1=../ghdl1-llvm$(EXEEXT) install.standard clean: force - $(RM) -f *.o *.ali ghdl_gcc ghdl_mcode ghdl_llvm ghdl_llvm_jit - $(RM) -f b~*.ad? *~ default_pathes.ads ghdl_simul + $(RM) -f *.o *.ali ghdl_gcc$(EXEEXT) ghdl_mcode$(EXEEXT) ghdl_llvm$(EXEEXT) ghdl_llvm_jit$(EXEEXT) + $(RM) -f b~*.ad? *~ default_pathes.ads ghdl_simul$(EXEEXT) $(RM) -rf ../lib clean-c: force diff --git a/src/grt/Makefile b/src/grt/Makefile index 107aef7bf..2213c5bc5 100644 --- a/src/grt/Makefile +++ b/src/grt/Makefile @@ -21,7 +21,7 @@ GRT_ADAFLAGS=-gnatn ADAC=gcc CC=gcc GNATFLAGS=$(CFLAGS) -gnatf -gnaty3befhkmr -gnatwlu -GHDL1=../ghdl1-gcc +GHDL1=../ghdl1-gcc$(EXEEXT) GRTSRCDIR=. GRT_RANLIB=ranlib |