From: fennecdjay <astor.jeremie@wanadoo.fr>
Date: Tue, 18 Jun 2019 22:19:44 +0000 (+0200)
Subject: Merge branch 'afac'
X-Git-Tag: nightly~2440
X-Git-Url: http://10.10.0.4:5575/?a=commitdiff_plain;h=fc66263d6409cb82ae6d518bac4c1b88d6d1e1be;p=gwion.git

Merge branch 'afac'
---

fc66263d6409cb82ae6d518bac4c1b88d6d1e1be
diff --cc Makefile
index 783de3e8,783de3e8..d1f650e7
--- a/Makefile
+++ b/Makefile
@@@ -1,3 -1,3 +1,6 @@@
++PACKAGE=gwion
++CFLAGS += -DPACKAGE='"{PACKAGE}"'
++
  ifeq (,$(wildcard util/config.mk))
  $(shell cp util/config.mk.orig util/config.mk)
  endif
@@@ -7,10 -7,10 +10,6 @@@ endi
  include util/config.mk
  include config.mk
  
--DEPDIR := .d
--$(shell mkdir -p $(DEPDIR) >/dev/null)
--DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$(@F:.o=.Td)
--
  # initialize source lists
  src_src := $(wildcard src/*.c)
  lib_src := $(wildcard src/lib/*.c)
@@@ -75,21 -75,21 +74,12 @@@ all: options util/libgwion_util.a ast/l
  libgwion.a: ${gwlib_obj}
  	${AR} ${AR_OPT}
  
--config.mk:
--	$(info generating config.mk)
--	@cp config.mk.orig config.mk
--
  util/libgwion_util.a:
  	@make -C util
  
  ast/libgwion_ast.a:
  	@make -C ast
  
--options:
--	$(info CC      : ${CC})
--	$(info CFLAGS  : ${CFLAGS})
--	$(info LDFLAGS : ${LDFLAGS})
--
  clean:
  	$(info cleaning ...)
  	@rm -f */*.o */*/*.o */*.gw.* */*/*.gw.* */*/*.gcda */*/*.gcno gwion
@@@ -100,12 -100,12 +90,6 @@@ src/arg.o
  	@mv -f $(DEPDIR)/$(@F:.o=.Td) $(DEPDIR)/$(@F:.o=.d) && touch $@
  	@echo $@: config.mk >> $(DEPDIR)/$(@F:.o=.d)
  
--.c.o: $(DEPDIR)/%.d
--	$(info compile $(<:.c=))
--	@${CC} $(DEPFLAGS) ${CFLAGS} ${CICFLAGS} -c $< -o $(<:.c=.o)
--	@mv -f $(DEPDIR)/$(@F:.o=.Td) $(DEPDIR)/$(@F:.o=.d) && touch $@
--	@echo $@: config.mk >> $(DEPDIR)/$(@F:.o=.d)
--
  install: ${PRG}
  	install ${PRG} ${PREFIX}/bin
  
@@@ -116,3 -116,3 +100,5 @@@ test
  	@bash help/test.sh tests/* examples
  
  include $(wildcard .d/*.d)
++include util/target.mk
++include util/intl.mk