100-replace-lua2c-with-sed.patch (3452B)
1 diff --git a/src/Makefile.in b/src/Makefile.in 2 index 31d45f7..d249f67 100644 3 --- a/src/Makefile.in 4 +++ b/src/Makefile.in 5 @@ -86,7 +86,6 @@ POST_INSTALL = : 6 NORMAL_UNINSTALL = : 7 PRE_UNINSTALL = : 8 POST_UNINSTALL = : 9 -@USE_LUA_TRUE@noinst_PROGRAMS = lua2c$(EXEEXT) 10 @INCLUDE_LUASHELL_TRUE@@USE_LUA_TRUE@am__append_1 = h_lua.c h_lua.h 11 @INCLUDE_LUACSHELL_TRUE@@USE_LUA_TRUE@am__append_2 = h_luac.c h_luac.h 12 bin_PROGRAMS = haserl$(EXEEXT) 13 @@ -124,9 +123,6 @@ am__DEPENDENCIES_1 = 14 haserl_DEPENDENCIES = $(am__DEPENDENCIES_1) 15 haserl_LINK = $(CCLD) $(haserl_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ 16 $(LDFLAGS) -o $@ 17 -lua2c_SOURCES = lua2c.c 18 -lua2c_OBJECTS = lua2c.$(OBJEXT) 19 -lua2c_LDADD = $(LDADD) 20 AM_V_P = $(am__v_P_@AM_V@) 21 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) 22 am__v_P_0 = false 23 @@ -159,8 +155,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) 24 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) 25 am__v_CCLD_0 = @echo " CCLD " $@; 26 am__v_CCLD_1 = 27 -SOURCES = $(haserl_SOURCES) $(nodist_haserl_SOURCES) lua2c.c 28 -DIST_SOURCES = $(am__haserl_SOURCES_DIST) lua2c.c 29 +SOURCES = $(haserl_SOURCES) $(nodist_haserl_SOURCES) 30 +DIST_SOURCES = $(am__haserl_SOURCES_DIST) 31 am__can_run_installinfo = \ 32 case $$AM_UPDATE_INFO_DIR in \ 33 n|no|NO) false;; \ 34 @@ -284,7 +280,7 @@ target_alias = @target_alias@ 35 top_build_prefix = @top_build_prefix@ 36 top_builddir = @top_builddir@ 37 top_srcdir = @top_srcdir@ 38 -EXTRA_DIST = haserl_lualib.lua lua2c.c 39 +EXTRA_DIST = haserl_lualib.lua 40 41 # Not strictly required, but we explicitly do not distribute the generated inc file 42 nodist_haserl_SOURCES = haserl_lualib.inc 43 @@ -396,10 +392,6 @@ haserl$(EXEEXT): $(haserl_OBJECTS) $(haserl_DEPENDENCIES) $(EXTRA_haserl_DEPENDE 44 @rm -f haserl$(EXEEXT) 45 $(AM_V_CCLD)$(haserl_LINK) $(haserl_OBJECTS) $(haserl_LDADD) $(LIBS) 46 47 -@USE_LUA_FALSE@lua2c$(EXEEXT): $(lua2c_OBJECTS) $(lua2c_DEPENDENCIES) $(EXTRA_lua2c_DEPENDENCIES) 48 -@USE_LUA_FALSE@ @rm -f lua2c$(EXEEXT) 49 -@USE_LUA_FALSE@ $(AM_V_CCLD)$(LINK) $(lua2c_OBJECTS) $(lua2c_LDADD) $(LIBS) 50 - 51 mostlyclean-compile: 52 -rm -f *.$(OBJEXT) 53 54 @@ -416,7 +408,6 @@ distclean-compile: 55 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-haserl.Po@am__quote@ 56 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-rfc2388.Po@am__quote@ 57 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/haserl-sliding_buffer.Po@am__quote@ 58 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lua2c.Po@am__quote@ 59 60 .c.o: 61 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< 62 @@ -770,17 +761,13 @@ uninstall-am: uninstall-binPROGRAMS 63 .PRECIOUS: Makefile 64 65 66 -# lua2c_LIBS ?= -llua -ldl -lm 67 -@USE_LUA_TRUE@lua2c_LDFLAGS ?= -Wl,-E 68 -@USE_LUA_TRUE@lua2c: lua2c.c 69 -@USE_LUA_TRUE@ $(CC_FOR_BUILD) $(CFLAGS) $(LUA_CFLAGS) $(LDFLAGS) $(lua2c_LDFLAGS) \ 70 -@USE_LUA_TRUE@ -o $@ $^ $(LIBS) $(LUA_LIBS) 71 72 -@USE_LUA_TRUE@haserl_lualib.inc : haserl_lualib.lua lua2c 73 -@USE_LUA_TRUE@ if ! ./lua2c haserl_lualib haserl_lualib.lua >$@; then \ 74 +@USE_LUA_TRUE@haserl_lualib.inc : haserl_lualib.lua 75 +@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 \ 76 @USE_LUA_TRUE@ rm $@; \ 77 @USE_LUA_TRUE@ exit 1 ;\ 78 @USE_LUA_TRUE@ fi 79 +@USE_LUA_TRUE@ { echo "static const char haserl_lualib[] = "; cat $@.tmp; echo ";"; rm $@.tmp; } >$@ 80 81 @USE_LUA_TRUE@h_lua_common.c : haserl_lualib.inc 82