Skip to content

Commit 0686e11

Browse files
author
ijsf@gmx-topmail.de
committed
Updated Makefile.in files for vendor
1 parent e435fae commit 0686e11

File tree

1 file changed

+28
-200
lines changed

1 file changed

+28
-200
lines changed

src/Makefile.in

Lines changed: 28 additions & 200 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515

1616
@SET_MAKE@
1717

18-
19-
2018
VPATH = @srcdir@
2119
pkgdatadir = $(datadir)/@PACKAGE@
2220
pkgincludedir = $(includedir)/@PACKAGE@
@@ -36,10 +34,9 @@ PRE_UNINSTALL = :
3634
POST_UNINSTALL = :
3735
build_triplet = @build@
3836
host_triplet = @host@
39-
bin_PROGRAMS = lua$(EXEEXT) luac$(EXEEXT)
4037
subdir = src
41-
DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
42-
$(srcdir)/Makefile.in $(srcdir)/luaconf.h.template.in
38+
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
39+
$(srcdir)/luaconf.h.template.in
4340
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
4441
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
4542
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -48,30 +45,7 @@ mkinstalldirs = $(install_sh) -d
4845
CONFIG_HEADER = $(top_builddir)/config.h
4946
CONFIG_CLEAN_FILES = luaconf.h.template
5047
CONFIG_CLEAN_VPATH_FILES =
51-
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
52-
am__vpath_adj = case $$p in \
53-
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
54-
*) f=$$p;; \
55-
esac;
56-
am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
57-
am__install_max = 40
58-
am__nobase_strip_setup = \
59-
srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
60-
am__nobase_strip = \
61-
for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
62-
am__nobase_list = $(am__nobase_strip_setup); \
63-
for p in $$list; do echo "$$p $$p"; done | \
64-
sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
65-
$(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
66-
if (++n[$$2] == $(am__install_max)) \
67-
{ print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
68-
END { for (dir in files) print dir, files[dir] }'
69-
am__base_list = \
70-
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
71-
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
72-
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
73-
"$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"
74-
LTLIBRARIES = $(lib_LTLIBRARIES)
48+
LTLIBRARIES = $(noinst_LTLIBRARIES)
7549
liblua_la_LIBADD =
7650
am_liblua_la_OBJECTS = lapi.lo lcode.lo ldebug.lo ldo.lo ldump.lo \
7751
lfunc.lo lgc.lo llex.lo lmem.lo lobject.lo lopcodes.lo \
@@ -83,14 +57,6 @@ liblua_la_OBJECTS = $(am_liblua_la_OBJECTS)
8357
liblua_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
8458
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
8559
$(liblua_la_LDFLAGS) $(LDFLAGS) -o $@
86-
PROGRAMS = $(bin_PROGRAMS)
87-
am_lua_OBJECTS = lua.$(OBJEXT)
88-
lua_OBJECTS = $(am_lua_OBJECTS)
89-
am_luac_OBJECTS = luac.$(OBJEXT) print.$(OBJEXT)
90-
luac_OBJECTS = $(am_luac_OBJECTS)
91-
luac_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
92-
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(luac_LDFLAGS) \
93-
$(LDFLAGS) -o $@
9460
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
9561
depcomp = $(SHELL) $(top_srcdir)/depcomp
9662
am__depfiles_maybe = depfiles
@@ -104,9 +70,8 @@ CCLD = $(CC)
10470
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
10571
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
10672
$(LDFLAGS) -o $@
107-
SOURCES = $(liblua_la_SOURCES) $(lua_SOURCES) $(luac_SOURCES)
108-
DIST_SOURCES = $(liblua_la_SOURCES) $(lua_SOURCES) $(luac_SOURCES)
109-
HEADERS = $(include_HEADERS) $(nodist_include_HEADERS)
73+
SOURCES = $(liblua_la_SOURCES)
74+
DIST_SOURCES = $(liblua_la_SOURCES)
11075
ETAGS = etags
11176
CTAGS = ctags
11277
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -227,9 +192,7 @@ top_build_prefix = @top_build_prefix@
227192
top_builddir = @top_builddir@
228193
top_srcdir = @top_srcdir@
229194
AM_CFLAGS = -Wall
230-
include_HEADERS = lua.h lualib.h lauxlib.h
231-
nodist_include_HEADERS = luaconf.h
232-
lib_LTLIBRARIES = liblua.la
195+
noinst_LTLIBRARIES = liblua.la
233196
liblua_la_LDFLAGS = -release 5.1
234197
liblua_la_SOURCES = \
235198
lapi.c lcode.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lmem.c \
@@ -241,16 +204,6 @@ liblua_la_SOURCES = \
241204
lobject.h lstate.h ltm.h lundump.h lcode.h lfunc.h llimits.h lopcodes.h \
242205
lstring.h lvm.h
243206

244-
lua_SOURCES = lua.c
245-
lua_LDADD = liblua.la @LUA_LIBS@
246-
lua_DEPENDENCIES = liblua.la
247-
luac_SOURCES = luac.c print.c
248-
luac_LDADD = liblua.la @LUA_LIBS@
249-
luac_DEPENDENCIES = liblua.la
250-
251-
# luac must be linked statically because it uses functions that
252-
# don't get exported to the shared object
253-
luac_LDFLAGS = -static
254207
EXTRA_DIST = luaconf.h.template.in
255208
BUILT_SOURCES = luaconf.h
256209
CLEANFILES = luaconf.h
@@ -296,88 +249,17 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
296249
$(am__aclocal_m4_deps):
297250
luaconf.h.template: $(top_builddir)/config.status $(srcdir)/luaconf.h.template.in
298251
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
299-
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
300-
@$(NORMAL_INSTALL)
301-
test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
302-
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
303-
list2=; for p in $$list; do \
304-
if test -f $$p; then \
305-
list2="$$list2 $$p"; \
306-
else :; fi; \
307-
done; \
308-
test -z "$$list2" || { \
309-
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
310-
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
311-
}
312-
313-
uninstall-libLTLIBRARIES:
314-
@$(NORMAL_UNINSTALL)
315-
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
316-
for p in $$list; do \
317-
$(am__strip_dir) \
318-
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
319-
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
320-
done
321252

322-
clean-libLTLIBRARIES:
323-
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
324-
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
253+
clean-noinstLTLIBRARIES:
254+
-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
255+
@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
325256
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
326257
test "$$dir" != "$$p" || dir=.; \
327258
echo "rm -f \"$${dir}/so_locations\""; \
328259
rm -f "$${dir}/so_locations"; \
329260
done
330261
liblua.la: $(liblua_la_OBJECTS) $(liblua_la_DEPENDENCIES)
331-
$(liblua_la_LINK) -rpath $(libdir) $(liblua_la_OBJECTS) $(liblua_la_LIBADD) $(LIBS)
332-
install-binPROGRAMS: $(bin_PROGRAMS)
333-
@$(NORMAL_INSTALL)
334-
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
335-
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
336-
for p in $$list; do echo "$$p $$p"; done | \
337-
sed 's/$(EXEEXT)$$//' | \
338-
while read p p1; do if test -f $$p || test -f $$p1; \
339-
then echo "$$p"; echo "$$p"; else :; fi; \
340-
done | \
341-
sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
342-
-e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
343-
sed 'N;N;N;s,\n, ,g' | \
344-
$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
345-
{ d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
346-
if ($$2 == $$4) files[d] = files[d] " " $$1; \
347-
else { print "f", $$3 "/" $$4, $$1; } } \
348-
END { for (d in files) print "f", d, files[d] }' | \
349-
while read type dir files; do \
350-
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
351-
test -z "$$files" || { \
352-
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
353-
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
354-
} \
355-
; done
356-
357-
uninstall-binPROGRAMS:
358-
@$(NORMAL_UNINSTALL)
359-
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
360-
files=`for p in $$list; do echo "$$p"; done | \
361-
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
362-
-e 's/$$/$(EXEEXT)/' `; \
363-
test -n "$$list" || exit 0; \
364-
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
365-
cd "$(DESTDIR)$(bindir)" && rm -f $$files
366-
367-
clean-binPROGRAMS:
368-
@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
369-
echo " rm -f" $$list; \
370-
rm -f $$list || exit $$?; \
371-
test -n "$(EXEEXT)" || exit 0; \
372-
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
373-
echo " rm -f" $$list; \
374-
rm -f $$list
375-
lua$(EXEEXT): $(lua_OBJECTS) $(lua_DEPENDENCIES)
376-
@rm -f lua$(EXEEXT)
377-
$(LINK) $(lua_OBJECTS) $(lua_LDADD) $(LIBS)
378-
luac$(EXEEXT): $(luac_OBJECTS) $(luac_DEPENDENCIES)
379-
@rm -f luac$(EXEEXT)
380-
$(luac_LINK) $(luac_OBJECTS) $(luac_LDADD) $(LIBS)
262+
$(liblua_la_LINK) $(liblua_la_OBJECTS) $(liblua_la_LIBADD) $(LIBS)
381263

382264
mostlyclean-compile:
383265
-rm -f *.$(OBJEXT)
@@ -411,12 +293,9 @@ distclean-compile:
411293
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltable.Plo@am__quote@
412294
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltablib.Plo@am__quote@
413295
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltm.Plo@am__quote@
414-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lua.Po@am__quote@
415-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luac.Po@am__quote@
416296
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lundump.Plo@am__quote@
417297
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lvm.Plo@am__quote@
418298
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzio.Plo@am__quote@
419-
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Po@am__quote@
420299

421300
.c.o:
422301
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -444,46 +323,6 @@ mostlyclean-libtool:
444323

445324
clean-libtool:
446325
-rm -rf .libs _libs
447-
install-includeHEADERS: $(include_HEADERS)
448-
@$(NORMAL_INSTALL)
449-
test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
450-
@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
451-
for p in $$list; do \
452-
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
453-
echo "$$d$$p"; \
454-
done | $(am__base_list) | \
455-
while read files; do \
456-
echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
457-
$(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
458-
done
459-
460-
uninstall-includeHEADERS:
461-
@$(NORMAL_UNINSTALL)
462-
@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
463-
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
464-
test -n "$$files" || exit 0; \
465-
echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
466-
cd "$(DESTDIR)$(includedir)" && rm -f $$files
467-
install-nodist_includeHEADERS: $(nodist_include_HEADERS)
468-
@$(NORMAL_INSTALL)
469-
test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
470-
@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
471-
for p in $$list; do \
472-
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
473-
echo "$$d$$p"; \
474-
done | $(am__base_list) | \
475-
while read files; do \
476-
echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
477-
$(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
478-
done
479-
480-
uninstall-nodist_includeHEADERS:
481-
@$(NORMAL_UNINSTALL)
482-
@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
483-
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
484-
test -n "$$files" || exit 0; \
485-
echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
486-
cd "$(DESTDIR)$(includedir)" && rm -f $$files
487326

488327
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
489328
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -570,13 +409,8 @@ distdir: $(DISTFILES)
570409
check-am: all-am
571410
check: $(BUILT_SOURCES)
572411
$(MAKE) $(AM_MAKEFLAGS) check-am
573-
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
574-
install-binPROGRAMS: install-libLTLIBRARIES
575-
412+
all-am: Makefile $(LTLIBRARIES)
576413
installdirs:
577-
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \
578-
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
579-
done
580414
install: $(BUILT_SOURCES)
581415
$(MAKE) $(AM_MAKEFLAGS) install-am
582416
install-exec: install-exec-am
@@ -607,8 +441,8 @@ maintainer-clean-generic:
607441
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
608442
clean: clean-am
609443

610-
clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
611-
clean-libtool mostlyclean-am
444+
clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
445+
mostlyclean-am
612446

613447
distclean: distclean-am
614448
-rm -rf ./$(DEPDIR)
@@ -628,13 +462,13 @@ info: info-am
628462

629463
info-am:
630464

631-
install-data-am: install-includeHEADERS install-nodist_includeHEADERS
465+
install-data-am:
632466

633467
install-dvi: install-dvi-am
634468

635469
install-dvi-am:
636470

637-
install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
471+
install-exec-am:
638472

639473
install-html: install-html-am
640474

@@ -674,28 +508,22 @@ ps: ps-am
674508

675509
ps-am:
676510

677-
uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
678-
uninstall-libLTLIBRARIES uninstall-nodist_includeHEADERS
511+
uninstall-am:
679512

680513
.MAKE: all check install install-am install-strip
681514

682-
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
683-
clean-generic clean-libLTLIBRARIES clean-libtool ctags \
684-
distclean distclean-compile distclean-generic \
685-
distclean-libtool distclean-tags distdir dvi dvi-am html \
686-
html-am info info-am install install-am install-binPROGRAMS \
687-
install-data install-data-am install-dvi install-dvi-am \
688-
install-exec install-exec-am install-html install-html-am \
689-
install-includeHEADERS install-info install-info-am \
690-
install-libLTLIBRARIES install-man \
691-
install-nodist_includeHEADERS install-pdf install-pdf-am \
692-
install-ps install-ps-am install-strip installcheck \
693-
installcheck-am installdirs maintainer-clean \
694-
maintainer-clean-generic mostlyclean mostlyclean-compile \
695-
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
696-
tags uninstall uninstall-am uninstall-binPROGRAMS \
697-
uninstall-includeHEADERS uninstall-libLTLIBRARIES \
698-
uninstall-nodist_includeHEADERS
515+
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
516+
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
517+
distclean-compile distclean-generic distclean-libtool \
518+
distclean-tags distdir dvi dvi-am html html-am info info-am \
519+
install install-am install-data install-data-am install-dvi \
520+
install-dvi-am install-exec install-exec-am install-html \
521+
install-html-am install-info install-info-am install-man \
522+
install-pdf install-pdf-am install-ps install-ps-am \
523+
install-strip installcheck installcheck-am installdirs \
524+
maintainer-clean maintainer-clean-generic mostlyclean \
525+
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
526+
pdf pdf-am ps ps-am tags uninstall uninstall-am
699527

700528

701529
luaconf.h : $(srcdir)/luaconf.h.template

0 commit comments

Comments
 (0)