Skip to content

Commit 6780228

Browse files
committed
Create tarballs through an Automake-like "make dist" command.
1 parent f16c611 commit 6780228

File tree

11 files changed

+718
-0
lines changed

11 files changed

+718
-0
lines changed

ChangeLog

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,28 @@
1+
2016-12-04 Bruno Haible <bruno@clisp.org>
2+
3+
Create tarballs through an Automake-like "make dist" command.
4+
* Makefile.in (SOURCE_FILES, LIBTOOL_IMPORTED_FILES,
5+
AUTOMAKE_OLD_IMPORTED_FILES, AUTOMAKE_IMPORTED_FILES, IMPORTED_FILES,
6+
GENERATED_FILES, DISTRIBUTED_BUILT_FILES, DISTFILES): New macros.
7+
(distdir): New target.
8+
(PACKAGE, VERSION, TAR, GZIP): New macros.
9+
(dist): New target.
10+
* lib/Makefile.in (SOURCE_FILES, IMPORTED_FILES, GENERATED_FILES,
11+
DISTRIBUTED_BUILT_FILES, DISTFILES): New macros.
12+
(distdir): New target.
13+
* man/Makefile.in (SOURCE_FILES, IMPORTED_FILES, GENERATED_FILES,
14+
DISTRIBUTED_BUILT_FILES, DISTFILES): New macros.
15+
(distdir): New target.
16+
* preload/Makefile.in (SOURCE_FILES, IMPORTED_FILES, GENERATED_FILES,
17+
DISTRIBUTED_BUILT_FILES, DISTFILES): New macros.
18+
(distdir): New target.
19+
* src/Makefile.in (SOURCE_FILES, IMPORTED_FILES, GENERATED_FILES,
20+
DISTRIBUTED_BUILT_FILES, DISTFILES): New macros.
21+
(distdir): New target.
22+
* tests/Makefile.in (SOURCE_FILES, IMPORTED_FILES, GENERATED_FILES,
23+
DISTRIBUTED_BUILT_FILES, DISTFILES): New macros.
24+
(distdir): New target.
25+
126
2016-12-04 Bruno Haible <bruno@clisp.org>
227

328
Remove duplicates of imported files from version control.

Makefile.in

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,120 @@ maintainer-clean : force
154154
$(RM) include/iconv.h include/iconv.h.inst
155155
rm -rf bin
156156

157+
158+
# List of source files.
159+
SOURCE_FILES = \
160+
README README.windows DEPENDENCIES HACKING AUTHORS NEWS DESIGN NOTES THANKS \
161+
ChangeLog Makefile.devel configure.ac Makefile.in \
162+
include/export.h include/iconv.h.in \
163+
gnulib-local/lib/alloca.in.h \
164+
gnulib-local/lib/error.h.diff \
165+
gnulib-local/lib/progname.h.diff \
166+
gnulib-local/lib/xalloc.h \
167+
gnulib-local/lib/xmalloc.c \
168+
gnulib-local/lib/xstrdup.c \
169+
gnulib-local/m4/alloca.m4 \
170+
gnulib-local/modules/libiconv-misc \
171+
gnulib-local/modules/mbstate \
172+
gnulib-local/modules/xalloc \
173+
m4/cp.m4 \
174+
m4/eilseq.m4 \
175+
m4/endian.m4 \
176+
m4/general.m4 \
177+
m4/ln.m4 \
178+
m4/proto.m4 \
179+
windows/iconv.rc windows/libiconv.rc windows/windres-options \
180+
woe32dll/export.h woe32dll/iconv-exports.c \
181+
os2/iconv.def \
182+
README.djgpp \
183+
djgpp/config.bat djgpp/config.sed djgpp/config.site djgpp/edtest.bat \
184+
djgpp/fnchange.in djgpp/fnchange.lst djgpp/Makefile.maint djgpp/makefile.sed \
185+
djgpp/README djgpp/README.in djgpp/sources.sed \
186+
djgpp/stateful-check.sed djgpp/stateless-check.sed djgpp/translit-check.sed \
187+
extras/ChangeLog extras/iconv_string.h extras/iconv_string.c \
188+
tools/Makefile \
189+
tools/8bit_tab_to_h.c tools/cjk_tab_to_h.c tools/cjk_variants.c \
190+
tools/CP50221-0208-EXT.TXT tools/CP50221-0212-EXT.TXT tools/JISX0213.TXT
191+
# List of distributed files imported from other packages.
192+
LIBTOOL_IMPORTED_FILES = \
193+
build-aux/ltmain.sh \
194+
m4/libtool.m4 \
195+
m4/lt~obsolete.m4 \
196+
m4/ltoptions.m4 \
197+
m4/ltsugar.m4 \
198+
m4/ltversion.m4
199+
AUTOMAKE_OLD_IMPORTED_FILES = \
200+
build-aux/mkinstalldirs
201+
AUTOMAKE_IMPORTED_FILES = \
202+
build-aux/ar-lib \
203+
build-aux/compile \
204+
build-aux/install-sh \
205+
build-aux/missing
206+
GNULIB_IMPORTED_FILES = \
207+
doc/relocatable.texi \
208+
build-aux/config.guess \
209+
build-aux/config.libpath \
210+
build-aux/config.rpath \
211+
build-aux/config.sub \
212+
build-aux/install-reloc \
213+
build-aux/reloc-ldflags \
214+
build-aux/snippet/arg-nonnull.h \
215+
build-aux/snippet/c++defs.h \
216+
build-aux/snippet/_Noreturn.h \
217+
build-aux/snippet/warn-on-use.h
218+
IMPORTED_FILES = \
219+
COPYING COPYING.LIB \
220+
ABOUT-NLS INSTALL.generic \
221+
$(LIBTOOL_IMPORTED_FILES) $(AUTOMAKE_OLD_IMPORTED_FILES) $(AUTOMAKE_IMPORTED_FILES) $(GNULIB_IMPORTED_FILES)
222+
# List of distributed files generated by autotools or Makefile.devel.
223+
GENERATED_FILES = \
224+
aclocal.m4 configure config.h.in \
225+
include/iconv.h.build.in
226+
# List of distributed files generated by "make".
227+
DISTRIBUTED_BUILT_FILES =
228+
# List of distributed files.
229+
DISTFILES = $(SOURCE_FILES) $(IMPORTED_FILES) $(GENERATED_FILES) $(DISTRIBUTED_BUILT_FILES)
230+
231+
distdir : $(DISTFILES)
232+
for file in $(DISTFILES); do \
233+
if test -f $$file; then dir='.'; else dir='$(srcdir)'; fi; \
234+
destdir=`echo '$(distdir)'/$$file | sed -e 's|//*[^/]*$$||'`; \
235+
test -d "$$destdir" || $(mkinstalldirs) "$$destdir" >/dev/null; \
236+
cp -p "$$dir/$$file" '$(distdir)'/$$file || exit 1; \
237+
done
238+
for sdir in srcm4; do \
239+
mkdir -p '$(distdir)'/$$sdir; \
240+
for file in '$(srcdir)'/$$sdir/*.m4; do \
241+
cp -p "$$file" '$(distdir)'/$$sdir/ || exit 1; \
242+
done; \
243+
done
244+
test -d '$(distdir)'/libcharset || mkdir '$(distdir)'/libcharset; cd libcharset && $(MAKE) distdir distdir='$(distdir)'/libcharset
245+
test -d '$(distdir)'/lib || mkdir '$(distdir)'/lib; cd lib && $(MAKE) distdir distdir='$(distdir)'/lib
246+
test -d '$(distdir)'/preload || mkdir '$(distdir)'/preload; cd preload && $(MAKE) distdir distdir='$(distdir)'/preload
247+
test -d '$(distdir)'/srclib || mkdir '$(distdir)'/srclib; cd srclib && $(MAKE) distdir distdir='$(distdir)'/srclib
248+
test -d '$(distdir)'/src || mkdir '$(distdir)'/src; cd src && $(MAKE) distdir distdir='$(distdir)'/src
249+
test -d '$(distdir)'/tests || mkdir '$(distdir)'/tests; cd tests && $(MAKE) distdir distdir='$(distdir)'/tests
250+
test -d '$(distdir)'/po || mkdir '$(distdir)'/po; cd po && $(MAKE) distdir distdir='$(distdir)'/po
251+
test -d '$(distdir)'/man || mkdir '$(distdir)'/man; cd man && $(MAKE) distdir distdir='$(distdir)'/man
252+
253+
254+
# Creating a distribution tarball.
255+
PACKAGE = @PACKAGE@
256+
VERSION = @VERSION@
257+
TAR = tar
258+
GZIP = gzip
259+
260+
dist : force
261+
tmpdistdir=$(PACKAGE)-$(VERSION); \
262+
abstmpdistdir=`pwd`/$$tmpdistdir; \
263+
rm -rf $$tmpdistdir $$tmpdistdir.tar $$tmpdistdir.tar.gz \
264+
&& mkdir $$tmpdistdir \
265+
&& $(MAKE) distdir distdir="$$abstmpdistdir" \
266+
&& $(TAR) chof $$tmpdistdir.tar --owner=root --group=root $$tmpdistdir \
267+
&& $(GZIP) -9 $$tmpdistdir.tar \
268+
&& rm -rf $$tmpdistdir
269+
270+
157271
force :
158272

159273
# Work around an automake-1.8 bug.

lib/Makefile.in

Lines changed: 234 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,5 +134,239 @@ distclean : clean
134134

135135
maintainer-clean : distclean
136136

137+
# List of source files.
138+
SOURCE_FILES = \
139+
Makefile.in config.h.in \
140+
encodings.def \
141+
encodings_aix.def \
142+
encodings_osf1.def \
143+
encodings_dos.def \
144+
encodings_extra.def \
145+
encodings_local.def \
146+
translit.def \
147+
genaliases.c \
148+
genaliases2.c \
149+
genflags.c \
150+
gentranslit.c \
151+
iconv.c \
152+
converters.h \
153+
ascii.h \
154+
utf8.h \
155+
ucs2.h \
156+
ucs2be.h \
157+
ucs2le.h \
158+
ucs4.h \
159+
ucs4be.h \
160+
ucs4le.h \
161+
utf16.h \
162+
utf16be.h \
163+
utf16le.h \
164+
utf32.h \
165+
utf32be.h \
166+
utf32le.h \
167+
utf7.h \
168+
ucs2internal.h \
169+
ucs2swapped.h \
170+
ucs4internal.h \
171+
ucs4swapped.h \
172+
c99.h \
173+
java.h \
174+
iso8859_1.h \
175+
iso8859_2.h \
176+
iso8859_3.h \
177+
iso8859_4.h \
178+
iso8859_5.h \
179+
iso8859_6.h \
180+
iso8859_7.h \
181+
iso8859_8.h \
182+
iso8859_9.h \
183+
iso8859_10.h \
184+
iso8859_11.h \
185+
iso8859_13.h \
186+
iso8859_14.h \
187+
iso8859_15.h \
188+
iso8859_16.h \
189+
koi8_r.h \
190+
koi8_u.h \
191+
koi8_ru.h \
192+
cp1250.h \
193+
cp1251.h \
194+
cp1252.h \
195+
cp1253.h \
196+
cp1254.h \
197+
cp1255.h \
198+
cp1256.h \
199+
cp1257.h \
200+
cp1258.h \
201+
vietcomb.h \
202+
cp850.h \
203+
cp862.h \
204+
cp866.h \
205+
cp1131.h \
206+
mac_roman.h \
207+
mac_centraleurope.h \
208+
mac_iceland.h \
209+
mac_croatian.h \
210+
mac_romania.h \
211+
mac_cyrillic.h \
212+
mac_ukraine.h \
213+
mac_greek.h \
214+
mac_turkish.h \
215+
mac_hebrew.h \
216+
mac_arabic.h \
217+
mac_thai.h \
218+
hp_roman8.h \
219+
nextstep.h \
220+
armscii_8.h \
221+
georgian_academy.h \
222+
georgian_ps.h \
223+
koi8_t.h \
224+
pt154.h \
225+
rk1048.h \
226+
mulelao.h \
227+
cp1133.h \
228+
tis620.h \
229+
cp874.h \
230+
viscii.h \
231+
tcvn.h \
232+
iso646_jp.h \
233+
jisx0201.h \
234+
jisx0208.h \
235+
jisx0212.h \
236+
iso646_cn.h \
237+
gb2312.h \
238+
isoir165.h \
239+
isoir165ext.h \
240+
gb12345.h \
241+
gb12345ext.h \
242+
gbk.h \
243+
gbkext1.h \
244+
gbkext2.h \
245+
gbkext_inv.h \
246+
cp936ext.h \
247+
cns11643.h \
248+
cns11643_1.h \
249+
cns11643_2.h \
250+
cns11643_3.h \
251+
cns11643_4.h \
252+
cns11643_4a.h \
253+
cns11643_4b.h \
254+
cns11643_5.h \
255+
cns11643_6.h \
256+
cns11643_7.h \
257+
cns11643_15.h \
258+
cns11643_inv.h \
259+
big5.h \
260+
ksc5601.h \
261+
johab_hangul.h \
262+
euc_jp.h \
263+
sjis.h \
264+
cp932.h \
265+
cp932ext.h \
266+
iso2022_jp.h \
267+
iso2022_jp1.h \
268+
iso2022_jp2.h \
269+
iso2022_jpms.h \
270+
cp50221_0208_ext.h \
271+
cp50221_0212_ext.h \
272+
euc_cn.h \
273+
ces_gbk.h \
274+
cp936.h \
275+
gb18030.h \
276+
gb18030ext.h \
277+
gb18030uni.h \
278+
iso2022_cn.h \
279+
iso2022_cnext.h \
280+
hz.h \
281+
euc_tw.h \
282+
ces_big5.h \
283+
cp950.h \
284+
cp950ext.h \
285+
big5hkscs1999.h \
286+
hkscs1999.h \
287+
big5hkscs2001.h \
288+
hkscs2001.h \
289+
big5hkscs2004.h \
290+
hkscs2004.h \
291+
big5hkscs2008.h \
292+
hkscs2008.h \
293+
euc_kr.h \
294+
cp949.h \
295+
uhc_1.h \
296+
uhc_2.h \
297+
johab.h \
298+
iso2022_kr.h \
299+
cp856.h \
300+
cp922.h \
301+
cp943.h \
302+
cp1046.h \
303+
cp1124.h \
304+
cp1129.h \
305+
cp1161.h \
306+
cp1162.h \
307+
cp1163.h \
308+
dec_kanji.h \
309+
dec_hanyu.h \
310+
cp437.h \
311+
cp737.h \
312+
cp775.h \
313+
cp852.h \
314+
cp853.h \
315+
cp855.h \
316+
cp857.h \
317+
cp858.h \
318+
cp860.h \
319+
cp861.h \
320+
cp863.h \
321+
cp864.h \
322+
cp865.h \
323+
cp869.h \
324+
cp1125.h \
325+
euc_jisx0213.h \
326+
jisx0213.h \
327+
shift_jisx0213.h \
328+
iso2022_jp3.h \
329+
big5_2003.h \
330+
tds565.h \
331+
atarist.h \
332+
riscos1.h \
333+
flushwc.h \
334+
cjk_variants.h \
335+
loops.h \
336+
loop_unicode.h \
337+
loop_wchar.h \
338+
aliases2.h \
339+
iconv_open1.h \
340+
iconv_open2.h \
341+
relocatable.h relocatable.c
342+
# List of distributed files imported from other packages.
343+
IMPORTED_FILES =
344+
# List of distributed files generated by autotools or Makefile.devel.
345+
GENERATED_FILES = \
346+
aliases.gperf aliases_sysaix.gperf aliases_syshpux.gperf aliases_sysosf1.gperf aliases_syssolaris.gperf \
347+
aliases.h aliases_sysaix.h aliases_syshpux.h aliases_sysosf1.h aliases_syssolaris.h \
348+
aliases_aix.h aliases_aix_sysaix.h \
349+
aliases_osf1.h aliases_osf1_sysosf1.h \
350+
aliases_dos.h \
351+
aliases_extra.h \
352+
canonical.h canonical_sysaix.h canonical_syshpux.h canonical_sysosf1.h canonical_syssolaris.h \
353+
canonical_aix.h canonical_aix_sysaix.h \
354+
canonical_osf1.h canonical_osf1_sysosf1.h \
355+
canonical_dos.h \
356+
canonical_extra.h \
357+
canonical_local.h canonical_local_sysaix.h canonical_local_syshpux.h canonical_local_sysosf1.h canonical_local_syssolaris.h \
358+
flags.h \
359+
translit.h
360+
# List of distributed files generated by "make".
361+
DISTRIBUTED_BUILT_FILES =
362+
# List of distributed files.
363+
DISTFILES = $(SOURCE_FILES) $(IMPORTED_FILES) $(GENERATED_FILES) $(DISTRIBUTED_BUILT_FILES)
364+
365+
distdir : $(DISTFILES)
366+
for file in $(DISTFILES); do \
367+
if test -f $$file; then dir='.'; else dir='$(srcdir)'; fi; \
368+
cp -p "$$dir/$$file" '$(distdir)'/$$file || exit 1; \
369+
done
370+
137371
force :
138372

0 commit comments

Comments
 (0)