You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

80 lines
3.3 KiB

  1. --- a/src/Makefile.in
  2. +++ b/src/Makefile.in
  3. @@ -86,7 +86,6 @@ POST_INSTALL = :
  4. NORMAL_UNINSTALL = :
  5. PRE_UNINSTALL = :
  6. POST_UNINSTALL = :
  7. -@USE_LUA_TRUE@noinst_PROGRAMS = lua2c$(EXEEXT)
  8. @INCLUDE_LUASHELL_TRUE@@USE_LUA_TRUE@am__append_1 = h_lua.c h_lua.h
  9. @INCLUDE_LUACSHELL_TRUE@@USE_LUA_TRUE@am__append_2 = h_luac.c h_luac.h
  10. bin_PROGRAMS = haserl$(EXEEXT)
  11. @@ -124,9 +123,6 @@ am__DEPENDENCIES_1 =
  12. haserl_DEPENDENCIES = $(am__DEPENDENCIES_1)
  13. haserl_LINK = $(CCLD) $(haserl_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
  14. $(LDFLAGS) -o $@
  15. -lua2c_SOURCES = lua2c.c
  16. -lua2c_OBJECTS = lua2c.$(OBJEXT)
  17. -lua2c_LDADD = $(LDADD)
  18. AM_V_P = $(am__v_P_@AM_V@)
  19. am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
  20. am__v_P_0 = false
  21. @@ -165,8 +161,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
  22. am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
  23. am__v_CCLD_0 = @echo " CCLD " $@;
  24. am__v_CCLD_1 =
  25. -SOURCES = $(haserl_SOURCES) $(nodist_haserl_SOURCES) lua2c.c
  26. -DIST_SOURCES = $(am__haserl_SOURCES_DIST) lua2c.c
  27. +SOURCES = $(haserl_SOURCES) $(nodist_haserl_SOURCES)
  28. +DIST_SOURCES = $(am__haserl_SOURCES_DIST)
  29. am__can_run_installinfo = \
  30. case $$AM_UPDATE_INFO_DIR in \
  31. n|no|NO) false;; \
  32. @@ -291,7 +287,7 @@ target_alias = @target_alias@
  33. top_build_prefix = @top_build_prefix@
  34. top_builddir = @top_builddir@
  35. top_srcdir = @top_srcdir@
  36. -EXTRA_DIST = haserl_lualib.lua lua2c.c
  37. +EXTRA_DIST = haserl_lualib.lua
  38. # Not strictly required, but we explicitly do not distribute the generated inc file
  39. nodist_haserl_SOURCES = haserl_lualib.inc
  40. @@ -403,10 +399,6 @@ haserl$(EXEEXT): $(haserl_OBJECTS) $(has
  41. @rm -f haserl$(EXEEXT)
  42. $(AM_V_CCLD)$(haserl_LINK) $(haserl_OBJECTS) $(haserl_LDADD) $(LIBS)
  43. -@USE_LUA_FALSE@lua2c$(EXEEXT): $(lua2c_OBJECTS) $(lua2c_DEPENDENCIES) $(EXTRA_lua2c_DEPENDENCIES)
  44. -@USE_LUA_FALSE@ @rm -f lua2c$(EXEEXT)
  45. -@USE_LUA_FALSE@ $(AM_V_CCLD)$(LINK) $(lua2c_OBJECTS) $(lua2c_LDADD) $(LIBS)
  46. -
  47. mostlyclean-compile:
  48. -rm -f *.$(OBJEXT)
  49. @@ -423,7 +415,6 @@ distclean-compile:
  50. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-haserl.Po@am__quote@ # am--include-marker
  51. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-rfc2388.Po@am__quote@ # am--include-marker
  52. @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-sliding_buffer.Po@am__quote@ # am--include-marker
  53. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lua2c.Po@am__quote@ # am--include-marker
  54. $(am__depfiles_remade):
  55. @$(MKDIR_P) $(@D)
  56. @@ -806,17 +797,12 @@ uninstall-am: uninstall-binPROGRAMS
  57. .PRECIOUS: Makefile
  58. -# lua2c_LIBS ?= -llua -ldl -lm
  59. -@USE_LUA_TRUE@lua2c_LDFLAGS ?= -Wl,-E
  60. -@USE_LUA_TRUE@lua2c: lua2c.c
  61. -@USE_LUA_TRUE@ $(CC_FOR_BUILD) $(CFLAGS) $(LUA_CFLAGS) $(LDFLAGS) $(lua2c_LDFLAGS) \
  62. -@USE_LUA_TRUE@ -o $@ $^ $(LIBS) $(LUA_LIBS)
  63. -
  64. -@USE_LUA_TRUE@haserl_lualib.inc : haserl_lualib.lua lua2c
  65. -@USE_LUA_TRUE@ if ! ./lua2c haserl_lualib haserl_lualib.lua >$@; then \
  66. +@USE_LUA_TRUE@haserl_lualib.inc : haserl_lualib.lua
  67. +@USE_LUA_TRUE@ if ! sed -re '/--\[\[/,/\]\]--/d; s/[[:space:]]*--.*//g; s/^[[:space:]]*//g; /^$$/d; s/ (=+) /\1/g; s/,[[:space:]]*/,/g; s/ ([()])/\1/g; s/key/k/g; s/value/v/g; s/^/"/; s/$$/\\n"/' haserl_lualib.lua >$@.tmp; then \
  68. @USE_LUA_TRUE@ rm $@; \
  69. @USE_LUA_TRUE@ exit 1 ;\
  70. @USE_LUA_TRUE@ fi
  71. +@USE_LUA_TRUE@ { echo "static const char haserl_lualib[] = "; cat $@.tmp; echo ";"; rm $@.tmp; } >$@
  72. @USE_LUA_TRUE@h_lua_common.c : haserl_lualib.inc