Skip to content

Commit b4dc7d0

Browse files
committed
Fix build infrastructure for distribution tarball.
1 parent 4abe949 commit b4dc7d0

File tree

4 files changed

+74
-15
lines changed

4 files changed

+74
-15
lines changed

Makefile.am

+3
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
AUTOMAKE_OPTIONS = foreign 1.4
44

55
SUBDIRS = src
6+
7+
dist_doc_DATA = README ChangeLog
8+

Makefile.in

+69-13
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# PARTICULAR PURPOSE.
1414

1515
@SET_MAKE@
16+
1617
VPATH = @srcdir@
1718
am__is_gnu_make = { \
1819
if test -z '$(MAKELEVEL)'; then \
@@ -93,7 +94,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
9394
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9495
$(ACLOCAL_M4)
9596
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
96-
$(am__configure_deps) $(am__DIST_COMMON)
97+
$(am__configure_deps) $(dist_doc_DATA) $(am__DIST_COMMON)
9798
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
9899
configure.lineno config.status.lineno
99100
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -127,6 +128,35 @@ am__can_run_installinfo = \
127128
n|no|NO) false;; \
128129
*) (install-info --version) >/dev/null 2>&1;; \
129130
esac
131+
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
132+
am__vpath_adj = case $$p in \
133+
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
134+
*) f=$$p;; \
135+
esac;
136+
am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
137+
am__install_max = 40
138+
am__nobase_strip_setup = \
139+
srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
140+
am__nobase_strip = \
141+
for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
142+
am__nobase_list = $(am__nobase_strip_setup); \
143+
for p in $$list; do echo "$$p $$p"; done | \
144+
sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
145+
$(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
146+
if (++n[$$2] == $(am__install_max)) \
147+
{ print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
148+
END { for (dir in files) print dir, files[dir] }'
149+
am__base_list = \
150+
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
151+
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
152+
am__uninstall_files_from_dir = { \
153+
test -z "$$files" \
154+
|| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
155+
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
156+
$(am__cd) "$$dir" && rm -f $$files; }; \
157+
}
158+
am__installdirs = "$(DESTDIR)$(docdir)"
159+
DATA = $(dist_doc_DATA)
130160
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
131161
distclean-recursive maintainer-clean-recursive
132162
am__recursive_targets = \
@@ -159,7 +189,7 @@ CSCOPE = cscope
159189
DIST_SUBDIRS = $(SUBDIRS)
160190
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
161191
COPYING ChangeLog INSTALL NEWS README TODO compile \
162-
config.guess config.sub install-sh ltmain.sh missing \
192+
config.guess config.sub depcomp install-sh ltmain.sh missing \
163193
mkinstalldirs
164194
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
165195
distdir = $(PACKAGE)-$(VERSION)
@@ -324,6 +354,7 @@ top_srcdir = @top_srcdir@
324354
# have all needed files, that a GNU package needs
325355
AUTOMAKE_OPTIONS = foreign 1.4
326356
SUBDIRS = src
357+
dist_doc_DATA = README ChangeLog
327358
all: config.h
328359
$(MAKE) $(AM_MAKEFLAGS) all-recursive
329360

@@ -385,6 +416,27 @@ clean-libtool:
385416

386417
distclean-libtool:
387418
-rm -f libtool config.lt
419+
install-dist_docDATA: $(dist_doc_DATA)
420+
@$(NORMAL_INSTALL)
421+
@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
422+
if test -n "$$list"; then \
423+
echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
424+
$(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
425+
fi; \
426+
for p in $$list; do \
427+
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
428+
echo "$$d$$p"; \
429+
done | $(am__base_list) | \
430+
while read files; do \
431+
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
432+
$(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
433+
done
434+
435+
uninstall-dist_docDATA:
436+
@$(NORMAL_UNINSTALL)
437+
@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
438+
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
439+
dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
388440

389441
# This directory's subdirectories are mostly independent; you can cd
390442
# into them and run 'make' without going through this Makefile.
@@ -691,9 +743,12 @@ distcleancheck: distclean
691743
exit 1; } >&2
692744
check-am: all-am
693745
check: check-recursive
694-
all-am: Makefile config.h
746+
all-am: Makefile $(DATA) config.h
695747
installdirs: installdirs-recursive
696748
installdirs-am:
749+
for dir in "$(DESTDIR)$(docdir)"; do \
750+
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
751+
done
697752
install: install-recursive
698753
install-exec: install-exec-recursive
699754
install-data: install-data-recursive
@@ -746,7 +801,7 @@ info: info-recursive
746801

747802
info-am:
748803

749-
install-data-am:
804+
install-data-am: install-dist_docDATA
750805

751806
install-dvi: install-dvi-recursive
752807

@@ -792,7 +847,7 @@ ps: ps-recursive
792847

793848
ps-am:
794849

795-
uninstall-am:
850+
uninstall-am: uninstall-dist_docDATA
796851

797852
.MAKE: $(am__recursive_targets) all install-am install-strip
798853

@@ -804,14 +859,15 @@ uninstall-am:
804859
distclean-generic distclean-hdr distclean-libtool \
805860
distclean-tags distcleancheck distdir distuninstallcheck dvi \
806861
dvi-am html html-am info info-am install install-am \
807-
install-data install-data-am install-dvi install-dvi-am \
808-
install-exec install-exec-am install-html install-html-am \
809-
install-info install-info-am install-man install-pdf \
810-
install-pdf-am install-ps install-ps-am install-strip \
811-
installcheck installcheck-am installdirs installdirs-am \
812-
maintainer-clean maintainer-clean-generic mostlyclean \
813-
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
814-
tags tags-am uninstall uninstall-am
862+
install-data install-data-am install-dist_docDATA install-dvi \
863+
install-dvi-am install-exec install-exec-am install-html \
864+
install-html-am install-info install-info-am install-man \
865+
install-pdf install-pdf-am install-ps install-ps-am \
866+
install-strip installcheck installcheck-am installdirs \
867+
installdirs-am maintainer-clean maintainer-clean-generic \
868+
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
869+
ps ps-am tags tags-am uninstall uninstall-am \
870+
uninstall-dist_docDATA
815871

816872
.PRECIOUS: Makefile
817873

src/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ AM_CPPFLAGS= $(all_includes)
66

77
# the library search path.
88
openrabbit_LDFLAGS = $(all_libraries)
9-
noinst_HEADERS = myio.h mytypes.h rabbit.h rabdata.h rabio.h rabmap.h mytypes.h
9+
noinst_HEADERS = myio.h mytypes.h rabbit.h rabdata.h rabio.h rabmap.h mytypes.h bios/tc_defs.lib bios/dkcore.lib
1010
openrabbit_LDADD = -lncurses
1111

src/Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ AM_CPPFLAGS = $(all_includes)
305305

306306
# the library search path.
307307
openrabbit_LDFLAGS = $(all_libraries)
308-
noinst_HEADERS = myio.h mytypes.h rabbit.h rabdata.h rabio.h rabmap.h mytypes.h
308+
noinst_HEADERS = myio.h mytypes.h rabbit.h rabdata.h rabio.h rabmap.h mytypes.h bios/tc_defs.lib bios/dkcore.lib
309309
openrabbit_LDADD = -lncurses
310310
all: all-am
311311

0 commit comments

Comments
 (0)