Merge branch 'afac'

diff --cc Makefile
index 783de3e8d00e0ad31625f622311cb2f95e50f736,783de3e8d00e0ad31625f622311cb2f95e50f736..d1f650e762a81326899f4948f613abef5494c2a3
--- 1/Makefile
--- 2/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