Skip to content

Commit dc44aa9

Browse files
committed
Merge pull request #158 from tetengo/readme_install
Readme install (cherry picked from commit 01222c6)
1 parent adfcf37 commit dc44aa9

File tree

10 files changed

+65
-21
lines changed

10 files changed

+65
-21
lines changed

Makefile.am

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,38 @@ SUBDIRS = \
1919
docsrc \
2020
precompiled
2121

22+
data_files = \
23+
COPYING \
24+
README.md
25+
2226
EXTRA_DIST = \
27+
${data_files} \
2328
bootstrap.sh \
2429
Doxyfile \
25-
README.md \
2630
tetengo.sln \
2731
tetengo.setup.sln
2832

2933

34+
nobase_pkgdata_DATA = \
35+
${data_files}
36+
37+
3038
.PHONY: precompiled_h
3139
precompiled_h:
32-
cd $(top_srcdir) && ./kogyan/tool/make_precompiled_h.py
40+
cd ${top_srcdir} && ./kogyan/tool/make_precompiled_h.py
3341

3442
.PHONY: doc
3543
doc:
36-
cd $(top_srcdir) && $(DOXYGEN) Doxyfile
37-
if test "$(top_srcdir)" != "$(top_builddir)"; \
44+
cd ${top_srcdir} && ${DOXYGEN} Doxyfile
45+
if test "${top_srcdir}" != "${top_builddir}"; \
3846
then \
39-
rm -rf $(top_builddir)/doc; \
40-
mv $(top_srcdir)/doc $(top_builddir); \
47+
rm -rf ${top_builddir}/doc; \
48+
mv ${top_srcdir}/doc ${top_builddir}; \
4149
fi
4250

4351
.PHONY: clean-doc
4452
clean-doc:
45-
-rm -rf $(top_builddir)/doc
53+
-rm -rf ${top_builddir}/doc
4654

4755
distclean-local: clean-doc
4856

@@ -53,7 +61,7 @@ clean-iwyu: ${SOURCE_SUBDIRS}
5361

5462
.PHONY: check_file_name_lengths
5563
check_file_name_lengths:
56-
cd $(top_srcdir) && ./kogyan/tool/check_file_name_lengths.py
64+
cd ${top_srcdir} && ./kogyan/tool/check_file_name_lengths.py
5765

5866
mypy: ${SCRIPT_SUBDIRS}
5967

executable/setup/res/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ resource_files = \
88
setup.rc
99

1010
EXTRA_DIST = \
11-
$(resource_files)
11+
${resource_files}

executable/setup/src/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ sources = \
77
winmain.cpp
88

99
EXTRA_DIST = \
10-
$(headers) $(sources)
10+
${headers} \
11+
${sources}
1112

1213

1314
iwyu:

sample/json2timetable/Makefile.am

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,18 @@ SUBDIRS = \
88
${SOURCE_SUBDIRS} \
99
data
1010

11+
data_files = \
12+
README.md
13+
1114
EXTRA_DIST = \
12-
README.md \
15+
${data_files} \
1316
json2timetable.vcxproj \
1417
json2timetable.vcxproj.filters
1518

19+
json2timetable_datadir = ${pkgdatadir}/json2timetable
20+
21+
json2timetable_data_DATA = ${data_files}
22+
1623

1724
iwyu: ${SOURCE_SUBDIRS}
1825

sample/json2timetable/data/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ data_files = \
55
hohi_down.json \
66
hohi_up.json
77

8-
EXTRA_DIST = $(data_files)
8+
EXTRA_DIST = ${data_files}
99

10-
json2timetable_datadir = $(pkgdatadir)/json2timetable
10+
json2timetable_datadir = ${pkgdatadir}/json2timetable
1111

12-
json2timetable_data_DATA = $(data_files)
12+
json2timetable_data_DATA = ${data_files}

sample/make_dict/Makefile.am

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,18 @@
44
SUBDIRS = \
55
src
66

7+
data_files = \
8+
README.md
9+
710
EXTRA_DIST = \
8-
README.md \
11+
${data_files} \
912
make_dict.vcxproj \
1013
make_dict.vcxproj.filters
1114

15+
make_dict_datadir = ${pkgdatadir}/make_dict
16+
17+
make_dict_data_DATA = ${data_files}
18+
1219

1320
iwyu: ${SUBDIRS}
1421

sample/search_dict/Makefile.am

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,18 @@
44
SUBDIRS = \
55
src
66

7+
data_files = \
8+
README.md
9+
710
EXTRA_DIST = \
8-
README.md \
11+
${data_files} \
912
search_dict.vcxproj \
1013
search_dict.vcxproj.filters
1114

15+
search_dict_datadir = ${pkgdatadir}/search_dict
16+
17+
search_dict_data_DATA = ${data_files}
18+
1219

1320
iwyu: ${SUBDIRS}
1421

sample/search_dict_c/Makefile.am

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,18 @@
44
SUBDIRS = \
55
src
66

7+
data_files = \
8+
README.md
9+
710
EXTRA_DIST = \
8-
README.md \
11+
${data_files} \
912
search_dict_c.vcxproj \
1013
search_dict_c.vcxproj.filters
1114

15+
search_dict_c_datadir = ${pkgdatadir}/search_dict_c
16+
17+
search_dict_c_data_DATA = ${data_files}
18+
1219

1320
iwyu: ${SUBDIRS}
1421

sample/transfer_trains/Makefile.am

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,18 @@ SUBDIRS = \
88
${SOURCE_SUBDIRS} \
99
data
1010

11+
data_files = \
12+
README.md
13+
1114
EXTRA_DIST = \
12-
README.md \
15+
${data_files} \
1316
transfer_trains.vcxproj \
1417
transfer_trains.vcxproj.filters
1518

19+
transfer_trains_datadir = ${pkgdatadir}/transfer_trains
20+
21+
transfer_trains_data_DATA = ${data_files}
22+
1623

1724
iwyu: ${SOURCE_SUBDIRS}
1825

sample/transfer_trains/data/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ data_files = \
55
kagoshima_down.txt \
66
kotoku_up.txt
77

8-
EXTRA_DIST = $(data_files)
8+
EXTRA_DIST = ${data_files}
99

10-
transfer_trains_datadir = $(pkgdatadir)/transfer_trains
10+
transfer_trains_datadir = ${pkgdatadir}/transfer_trains
1111

12-
transfer_trains_data_DATA = $(data_files)
12+
transfer_trains_data_DATA = ${data_files}

0 commit comments

Comments
 (0)