d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Newer versions of GNU Make have a new function which collides with a

Browse source 
variable we're using; change the name of the variable.
This commit is contained in:
David Given 2015-03-22 12:09:46 +01:00
parent aacabba165
commit 3d5e72e20b
17 changed files with 92 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
first/core.mk
View file

@ -51,7 +51,7 @@ endef
# --- Add a raw to the queue # --- Add a raw to the queue
define file define rawfile
$(eval q += $1) $(eval q += $1)
endef endef

14
lang/basic/src/build.mk
View file

@ -29,13 +29,13 @@ $g: $D/maketokentab $(OBJDIR)/$D/Lpars.h
$(eval $q: $(OBJDIR)/$D/Lpars.h) $(eval $q: $(OBJDIR)/$D/Lpars.h)
$(eval $q: $(INCDIR)/print.h) $(eval $q: $(INCDIR)/print.h)
$(call file, $(LIBEM_MES)) $(call rawfile, $(LIBEM_MES))
$(call file, $(LIBEMK)) $(call rawfile, $(LIBEMK))
$(call file, $(LIBEM_DATA)) $(call rawfile, $(LIBEM_DATA))
$(call file, $(LIBALLOC)) $(call rawfile, $(LIBALLOC))
$(call file, $(LIBPRINT)) $(call rawfile, $(LIBPRINT))
$(call file, $(LIBSTRING)) $(call rawfile, $(LIBSTRING))
$(call file, $(LIBSYSTEM)) $(call rawfile, $(LIBSYSTEM))
$(call cprogram, $(BINDIR)/em_bem) $(call cprogram, $(BINDIR)/em_bem)
$(call installto, $(PLATDEP)/em_bem) $(call installto, $(PLATDEP)/em_bem)

20
lang/cem/cemcom.ansi/build.mk
View file

@ -134,16 +134,16 @@ $(call build-cemcom-ansi-next, \
$(eval $q: $(OBJDIR)/$D/Lpars.h) $(eval $q: $(OBJDIR)/$D/Lpars.h)
$(call file, $(LIBEM_MES)) $(call rawfile, $(LIBEM_MES))
$(call file, $(LIBEMK)) $(call rawfile, $(LIBEMK))
$(call file, $(LIBEM_DATA)) $(call rawfile, $(LIBEM_DATA))
$(call file, $(LIBINPUT)) $(call rawfile, $(LIBINPUT))
$(call file, $(LIBASSERT)) $(call rawfile, $(LIBASSERT))
$(call file, $(LIBALLOC)) $(call rawfile, $(LIBALLOC))
$(call file, $(LIBFLT_ARITH)) $(call rawfile, $(LIBFLT_ARITH))
$(call file, $(LIBPRINT)) $(call rawfile, $(LIBPRINT))
$(call file, $(LIBSYSTEM)) $(call rawfile, $(LIBSYSTEM))
$(call file, $(LIBSTRING)) $(call rawfile, $(LIBSTRING))
$(call cprogram, $(BINDIR)/cemcom.ansi) $(call cprogram, $(BINDIR)/cemcom.ansi)
$(call installto, $(PLATDEP)/em_cemcom.ansi) $(call installto, $(PLATDEP)/em_cemcom.ansi)
$(eval CEMCOMANSI := $o) $(eval CEMCOMANSI := $o)

12
lang/cem/cpp.ansi/build.mk
View file

@ -71,12 +71,12 @@ define build-cpp-ansi-impl
$(call llgen, $(OBJDIR)/$D, $(OBJDIR)/$D/tokenfile.g $D/expression.g) $(call llgen, $(OBJDIR)/$D, $(OBJDIR)/$D/tokenfile.g $D/expression.g)
$(call file, $(LIBINPUT)) $(call rawfile, $(LIBINPUT))
$(call file, $(LIBASSERT)) $(call rawfile, $(LIBASSERT))
$(call file, $(LIBALLOC)) $(call rawfile, $(LIBALLOC))
$(call file, $(LIBPRINT)) $(call rawfile, $(LIBPRINT))
$(call file, $(LIBSYSTEM)) $(call rawfile, $(LIBSYSTEM))
$(call file, $(LIBSTRING)) $(call rawfile, $(LIBSTRING))
$(call tabgen, $D/char.tab) $(call tabgen, $D/char.tab)

20
lang/m2/comp/build.mk
View file

@ -108,16 +108,16 @@ $(eval $q: $(INCDIR)/em_codeEK.h)
$(eval $q: $(INCDIR)/print.h) $(eval $q: $(INCDIR)/print.h)
$(eval $q: $(INCDIR)/system.h) $(eval $q: $(INCDIR)/system.h)
$(call file, $(LIBEM_MES)) $(call rawfile, $(LIBEM_MES))
$(call file, $(LIBEMK)) $(call rawfile, $(LIBEMK))
$(call file, $(LIBEM_DATA)) $(call rawfile, $(LIBEM_DATA))
$(call file, $(LIBINPUT)) $(call rawfile, $(LIBINPUT))
$(call file, $(LIBASSERT)) $(call rawfile, $(LIBASSERT))
$(call file, $(LIBALLOC)) $(call rawfile, $(LIBALLOC))
$(call file, $(LIBFLT_ARITH)) $(call rawfile, $(LIBFLT_ARITH))
$(call file, $(LIBPRINT)) $(call rawfile, $(LIBPRINT))
$(call file, $(LIBSYSTEM)) $(call rawfile, $(LIBSYSTEM))
$(call file, $(LIBSTRING)) $(call rawfile, $(LIBSTRING))
$(call cprogram, $(BINDIR)/em_m2) $(call cprogram, $(BINDIR)/em_m2)
$(call installto, $(PLATDEP)/em_m2) $(call installto, $(PLATDEP)/em_m2)

2
lang/m2/libm2/build.mk
View file

@ -95,7 +95,7 @@ $(eval g := \
$(foreach f, $g, \ $(foreach f, $g, \
$(call reset) \ $(call reset) \
$(call file, lang/m2/libm2/$f) \ $(call rawfile, lang/m2/libm2/$f) \
$(call installto, $(PLATIND)/include/modula2/$f)) $(call installto, $(PLATIND)/include/modula2/$f))
endef endef

20
lang/pc/comp/build.mk
View file

@ -111,16 +111,16 @@ $(eval $q: $(INCDIR)/em_codeEK.h)
$(eval $q: $(INCDIR)/print.h) $(eval $q: $(INCDIR)/print.h)
$(eval $q: $(INCDIR)/system.h) $(eval $q: $(INCDIR)/system.h)
$(call file, $(LIBEM_MES)) $(call rawfile, $(LIBEM_MES))
$(call file, $(LIBEMK)) $(call rawfile, $(LIBEMK))
$(call file, $(LIBEM_DATA)) $(call rawfile, $(LIBEM_DATA))
$(call file, $(LIBINPUT)) $(call rawfile, $(LIBINPUT))
$(call file, $(LIBASSERT)) $(call rawfile, $(LIBASSERT))
$(call file, $(LIBALLOC)) $(call rawfile, $(LIBALLOC))
$(call file, $(LIBFLT_ARITH)) $(call rawfile, $(LIBFLT_ARITH))
$(call file, $(LIBPRINT)) $(call rawfile, $(LIBPRINT))
$(call file, $(LIBSYSTEM)) $(call rawfile, $(LIBSYSTEM))
$(call file, $(LIBSTRING)) $(call rawfile, $(LIBSTRING))
$(call cprogram, $(BINDIR)/em_pc) $(call cprogram, $(BINDIR)/em_pc)
$(call installto, $(PLATDEP)/em_pc) $(call installto, $(PLATDEP)/em_pc)

2
mach/proto/as/build.mk
View file

@ -36,7 +36,7 @@ $(OBJDIR)/$D/preprocessed-comm2.y: mach/proto/as/comm2.y $(CPPANSI) \
-Ih \ -Ih \
mach/proto/as/comm2.y > $$@ mach/proto/as/comm2.y > $$@
$(call file, $(LIBOBJECT)) $(call rawfile, $(LIBOBJECT))
$(call cprogram, $(BINDIR)/$(PLATFORM)/as) $(call cprogram, $(BINDIR)/$(PLATFORM)/as)
$(call installto, $(PLATDEP)/$(PLATFORM)/as) $(call installto, $(PLATDEP)/$(PLATFORM)/as)
endef endef

4
mach/proto/ncg/build.mk
View file

@ -36,8 +36,8 @@ $(call cfile, $(OBJDIR)/$D/tables.c)
$(eval $q: $(INCDIR)/flt_arith.h) $(eval $q: $(INCDIR)/flt_arith.h)
$(call file, $(LIBEM_DATA)) $(call rawfile, $(LIBEM_DATA))
$(call file, $(LIBFLT_ARITH)) $(call rawfile, $(LIBFLT_ARITH))
$(call cprogram, $(BINDIR)/$(PLATFORM)/ncg) $(call cprogram, $(BINDIR)/$(PLATFORM)/ncg)
$(call installto, $(PLATDEP)/$(PLATFORM)/ncg) $(call installto, $(PLATDEP)/$(PLATFORM)/ncg)

2
util/amisc/build.mk
View file

@ -2,7 +2,7 @@
define build-simple-tool-impl define build-simple-tool-impl
$(call reset) $(call reset)
$(call cfile, util/amisc/$1.c) $(call cfile, util/amisc/$1.c)
$(call file, $(LIBOBJECT)) $(call rawfile, $(LIBOBJECT))
$(call cprogram, $(BINDIR)/$1) $(call cprogram, $(BINDIR)/$1)
$(eval INSTALLABLES += $o) $(eval INSTALLABLES += $o)
$(call installto, $(INSDIR)/bin/$1) $(call installto, $(INSDIR)/bin/$1)

8
util/arch/build.mk
View file

@ -6,10 +6,10 @@ define build-aal-impl
$(call cfile, $D/archiver.c) $(call cfile, $D/archiver.c)
$(call file, $(LIBOBJECT)) $(call rawfile, $(LIBOBJECT))
$(call file, $(LIBPRINT)) $(call rawfile, $(LIBPRINT))
$(call file, $(LIBSTRING)) $(call rawfile, $(LIBSTRING))
$(call file, $(LIBSYSTEM)) $(call rawfile, $(LIBSYSTEM))
$(call cprogram, $(BINDIR)/aal) $(call cprogram, $(BINDIR)/aal)
$(call installto, $(INSDIR)/bin/aal) $(call installto, $(INSDIR)/bin/aal)

10
util/ego/build.mk
View file

@ -6,8 +6,8 @@ $(call reset)
$(eval cflags += -DVERBOSE -DNOTCOMPACT) $(eval cflags += -DVERBOSE -DNOTCOMPACT)
$(eval cflags += -I$D/share -I$(OBJDIR)/$D) $(eval cflags += -I$D/share -I$(OBJDIR)/$D)
$(foreach f, $2, $(call cfile, $f)) $(foreach f, $2, $(call cfile, $f))
$(call file, $(LIBDIR)/libegocore.a) $(call rawfile, $(LIBDIR)/libegocore.a)
$(call file, $(LIBEM_DATA)) $(call rawfile, $(LIBEM_DATA))
$(call cprogram, $(BINDIR)/ego/$(strip $1)) $(call cprogram, $(BINDIR)/ego/$(strip $1))
$(call installto, $(PLATDEP)/ego/$(strip $1)) $(call installto, $(PLATDEP)/ego/$(strip $1))
$(eval EGO_MODULES += $q) $(eval EGO_MODULES += $q)
@ -166,9 +166,9 @@ $(call cfile, $D/em_ego/em_ego.c)
$(eval $q: $(INCDIR)/print.h $(INCDIR)/system.h) $(eval $q: $(INCDIR)/print.h $(INCDIR)/system.h)
$(eval $q: $(INCDIR)/em_path.h) $(eval $q: $(INCDIR)/em_path.h)
$(call file, $(LIBPRINT)) $(call rawfile, $(LIBPRINT))
$(call file, $(LIBSTRING)) $(call rawfile, $(LIBSTRING))
$(call file, $(LIBSYSTEM)) $(call rawfile, $(LIBSYSTEM))
$(call cprogram, $(BINDIR)/em_ego) $(call cprogram, $(BINDIR)/em_ego)
$(call installto, $(PLATDEP)/em_ego) $(call installto, $(PLATDEP)/em_ego)

4
util/led/build.mk
View file

@ -16,8 +16,8 @@ define build-led-impl
$(call cfile, $D/sym.c) $(call cfile, $D/sym.c)
$(call cfile, $D/write.c) $(call cfile, $D/write.c)
$(call file, $(LIBSTRING)) $(call rawfile, $(LIBSTRING))
$(call file, $(LIBOBJECT)) $(call rawfile, $(LIBOBJECT))
$(call cprogram, $(BINDIR)/em_led) $(call cprogram, $(BINDIR)/em_led)
$(call installto, $(PLATDEP)/em_led) $(call installto, $(PLATDEP)/em_led)

28
util/misc/build.mk
View file

@ -14,13 +14,13 @@ define build-misc-impl
$(eval objdir := encode) $(eval objdir := encode)
$(call cfile, $D/convert.c) $(call cfile, $D/convert.c)
$(eval $q: $(INCDIR)/em_comp.h $(INCDIR)/em_codeEK.h) $(eval $q: $(INCDIR)/em_comp.h $(INCDIR)/em_codeEK.h)
$(call file, $(LIBREAD_EMEV)) $(call rawfile, $(LIBREAD_EMEV))
$(call file, $(LIBEMK)) $(call rawfile, $(LIBEMK))
$(call file, $(LIBEM_DATA)) $(call rawfile, $(LIBEM_DATA))
$(call file, $(LIBALLOC)) $(call rawfile, $(LIBALLOC))
$(call file, $(LIBPRINT)) $(call rawfile, $(LIBPRINT))
$(call file, $(LIBSTRING)) $(call rawfile, $(LIBSTRING))
$(call file, $(LIBSYSTEM)) $(call rawfile, $(LIBSYSTEM))
$(call cprogram, $(BINDIR)/em_encode) $(call cprogram, $(BINDIR)/em_encode)
$(call installto, $(PLATDEP)/em_encode) $(call installto, $(PLATDEP)/em_encode)
$(eval EM_ENCODE := $o) $(eval EM_ENCODE := $o)
@ -30,13 +30,13 @@ define build-misc-impl
$(eval objdir := decode) $(eval objdir := decode)
$(call cfile, $D/convert.c) $(call cfile, $D/convert.c)
$(eval $q: $(INCDIR)/em_comp.h $(INCDIR)/em_codeEK.h) $(eval $q: $(INCDIR)/em_comp.h $(INCDIR)/em_codeEK.h)
$(call file, $(LIBREAD_EMKV)) $(call rawfile, $(LIBREAD_EMKV))
$(call file, $(LIBEME)) $(call rawfile, $(LIBEME))
$(call file, $(LIBEM_DATA)) $(call rawfile, $(LIBEM_DATA))
$(call file, $(LIBALLOC)) $(call rawfile, $(LIBALLOC))
$(call file, $(LIBPRINT)) $(call rawfile, $(LIBPRINT))
$(call file, $(LIBSTRING)) $(call rawfile, $(LIBSTRING))
$(call file, $(LIBSYSTEM)) $(call rawfile, $(LIBSYSTEM))
$(call cprogram, $(BINDIR)/em_decode) $(call cprogram, $(BINDIR)/em_decode)
$(call installto, $(PLATDEP)/em_decode) $(call installto, $(PLATDEP)/em_decode)
$(eval EM_DECODE := $o) $(eval EM_DECODE := $o)

2
util/ncgg/build.mk
View file

@ -34,7 +34,7 @@ $(call cfile, $(OBJDIR)/$D/enterkeyw.c)
$(eval $q: $(INCDIR)/em_spec.h) $(eval $q: $(INCDIR)/em_spec.h)
$(call file, $(LIBEM_DATA)) $(call rawfile, $(LIBEM_DATA))
$(call cprogram, $(BINDIR)/ncgg) $(call cprogram, $(BINDIR)/ncgg)
$(eval NCGG := $o) $(eval NCGG := $o)

21
util/opt/build.mk
View file

@ -10,12 +10,15 @@ $(call yacc, $(OBJDIR)/$D, $D/mktab.y)
$(call flex, $(OBJDIR)/$D, $D/scan.l) $(call flex, $(OBJDIR)/$D, $D/scan.l)
$(call dependson, $(OBJDIR)/$D/y.tab.h) $(call dependson, $(OBJDIR)/$D/y.tab.h)
$(call file, $(LIBEM_DATA)) $(call rawfile, $(LIBEM_DATA))
$(call file, -lfl) $(call rawfile, -lfl)
$(call cprogram, $(OBJDIR)/$D/mktab) $(call cprogram, $(OBJDIR)/$D/mktab)
endef endef
.PHONY: -lfl
-lfl:
define build-opt-impl define build-opt-impl
$(call reset) $(call reset)
@ -53,12 +56,12 @@ $g: $(OBJDIR)/$D/mktab $D/patterns $(BINDIR)/cpp.ansi
$(hide) $(BINDIR)/cpp.ansi < $D/patterns | $(OBJDIR)/$D/mktab > $$@ $(hide) $(BINDIR)/cpp.ansi < $D/patterns | $(OBJDIR)/$D/mktab > $$@
$(call cfile, $g) $(call cfile, $g)
$(call file, $(LIBEM_DATA)) $(call rawfile, $(LIBEM_DATA))
$(call file, $(LIBASSERT)) $(call rawfile, $(LIBASSERT))
$(call file, $(LIBPRINT)) $(call rawfile, $(LIBPRINT))
$(call file, $(LIBALLOC)) $(call rawfile, $(LIBALLOC))
$(call file, $(LIBSYSTEM)) $(call rawfile, $(LIBSYSTEM))
$(call file, $(LIBSTRING)) $(call rawfile, $(LIBSTRING))
$(eval $q: $(INCDIR)/em_spec.h) $(eval $q: $(INCDIR)/em_spec.h)
@ -79,4 +82,4 @@ endef
$(eval $(build-opt-mktab-impl)) $(eval $(build-opt-mktab-impl))
$(eval $(call build-opt-impl, em_opt,)) $(eval $(call build-opt-impl, em_opt,))
$(eval $(call build-opt-impl, em_opt2, -DGLOBAL_OPT)) $(eval $(call build-opt-impl, em_opt2, -DGLOBAL_OPT))
$(eval $(build-opt-manpage-impl)) $(eval $(build-opt-manpage-impl))

10
util/topgen/build.mk
View file

@ -15,11 +15,11 @@ define build-topgen-impl
$(call llgen, $(OBJDIR)/$D, $D/topgen.g) $(call llgen, $(OBJDIR)/$D, $D/topgen.g)
$(call file, $(LIBASSERT)) $(call rawfile, $(LIBASSERT))
$(call file, $(LIBPRINT)) $(call rawfile, $(LIBPRINT))
$(call file, $(LIBALLOC)) $(call rawfile, $(LIBALLOC))
$(call file, $(LIBSYSTEM)) $(call rawfile, $(LIBSYSTEM))
$(call file, $(LIBSTRING)) $(call rawfile, $(LIBSTRING))
$(call cprogram, $(BINDIR)/topgen) $(call cprogram, $(BINDIR)/topgen)
TOPGEN := $o TOPGEN := $o