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

Fix build error in opt which was causing all code, everywhere, to be broken.

Browse source 
Remember to build opt2 too.

--HG--
branch : dtrg-buildsystem
This commit is contained in:
David Given 2013-05-15 22:09:28 +01:00
parent e9233b4712
commit aaa3f14a79
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
util/opt/build.mk
View file

@ -12,14 +12,16 @@ $(call dependson, $(OBJDIR)/$D/y.tab.h)
$(call file, $(LIBEM_DATA)) $(call file, $(LIBEM_DATA))
$(call file, -lfl) $(call file, -lfl)
$(call cprogram, $D/mktab) $(call cprogram, $(OBJDIR)/$D/mktab)
endef endef
define build-opt-impl define build-opt-impl
$(call reset) $(call reset)
$(eval cflags += -I$D) $(eval objdir := $1)
$(eval cflags += -I$D $2)
$(call cfile, $D/main.c) $(call cfile, $D/main.c)
$(call cfile, $D/getline.c) $(call cfile, $D/getline.c)
$(call cfile, $D/lookup.c) $(call cfile, $D/lookup.c)
@ -35,25 +37,21 @@ $(call cfile, $D/flow.c)
$(call cfile, $D/tes.c) $(call cfile, $D/tes.c)
$(call cfile, $D/reg.c) $(call cfile, $D/reg.c)
$(eval CLEANABLES += $(OBJDIR)/$D/pop_push.c) $(eval g := $(OBJDIR)/$D/$(objdir)/pop_push.c)
$(OBJDIR)/$D/pop_push.c: $D/pop_push.awk h/em_table $(eval CLEANABLES += $g)
$g: $D/pop_push.awk h/em_table
@echo POP_PUSH $$@ @echo POP_PUSH $$@
@mkdir -p $$(dir $$@) @mkdir -p $$(dir $$@)
$(hide) awk -f $D/pop_push.awk < h/em_table > $$@ $(hide) awk -f $D/pop_push.awk < h/em_table > $$@
$(call cfile, $(OBJDIR)/$D/pop_push.c) $(call cfile, $g)
$(eval CLEANABLES += $(OBJDIR)/$D/pattern.c) $(eval g := $(OBJDIR)/$D/$(objdir)/pattern.c)
$(OBJDIR)/$D/pattern.c: $D/mktab $(OBJDIR)/$D/patterns $(eval CLEANABLES += $g)
$g: $(OBJDIR)/$D/mktab $D/patterns $(BINDIR)/cpp.ansi
@echo PATTERNS $$@ @echo PATTERNS $$@
@mkdir -p $$(dir $$@) @mkdir -p $$(dir $$@)
$(hide) $D/mktab < $(OBJDIR)/$D/patterns > $$@ $(hide) $(BINDIR)/cpp.ansi < $D/patterns | $(OBJDIR)/$D/mktab > $$@
$(call cfile, $(OBJDIR)/$D/pattern.c) $(call cfile, $g)
$(eval CLEANABLES += $(OBJDIR)/$D/patterns)
$(OBJDIR)/$D/patterns: $(CPPANSI) $D/patterns
@echo PREPROCESS $$@
@mkdir -p $$(dir $$@)
$(hide) $(CPPANSI) < $D/patterns > $$@
$(call file, $(LIBEM_DATA)) $(call file, $(LIBEM_DATA))
$(call file, $(LIBASSERT)) $(call file, $(LIBASSERT))
@ -64,11 +62,14 @@ $(call file, $(LIBSTRING))
$(eval $q: $(INCDIR)/em_spec.h) $(eval $q: $(INCDIR)/em_spec.h)
$(call cprogram, $(BINDIR)/em_opt) $(call cprogram, $(BINDIR)/$(strip $1))
$(call installto, $(PLATDEP)/em_opt) $(call installto, $(PLATDEP)/$(strip $1))
$(eval EM_OPT := $o)
$(eval ACK_CORE_TOOLS += $o) $(eval ACK_CORE_TOOLS += $o)
endef
define build-opt-manpage-impl
$(call reset) $(call reset)
$(eval q := $D/em_opt.6) $(eval q := $D/em_opt.6)
$(call installto, $(INSDIR)/share/man/man6/em_opt.6) $(call installto, $(INSDIR)/share/man/man6/em_opt.6)
@ -76,4 +77,6 @@ $(call installto, $(INSDIR)/share/man/man6/em_opt.6)
endef endef
$(eval $(build-opt-mktab-impl)) $(eval $(build-opt-mktab-impl))
$(eval $(build-opt-impl)) $(eval $(call build-opt-impl, em_opt,))
$(eval $(call build-opt-impl, em_opt2, -DGLOBAL_OPT))
$(eval $(build-opt-manpage-impl))