diff options
| author | Simon Howard | 2010-02-06 03:14:20 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-02-06 03:14:20 +0000 |
| commit | d9520b6415f8e373cf759f316094b986e57f0f5a (patch) | |
| tree | d256f7d4f1941ec33ae3c956449c70349de7297d /Makefile.am | |
| parent | 57011e785808847273461aaf6d8ed1df76ff1db9 (diff) | |
| parent | 52f81b4ef175358d1e1f7f9eecab2a1edb7f4b65 (diff) | |
| download | chocolate-doom-d9520b6415f8e373cf759f316094b986e57f0f5a.tar.gz chocolate-doom-d9520b6415f8e373cf759f316094b986e57f0f5a.tar.bz2 chocolate-doom-d9520b6415f8e373cf759f316094b986e57f0f5a.zip | |
Merge from trunk.
Subversion-branch: /branches/strife-branch
Subversion-revision: 1849
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 15ad2252..e331d204 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,9 +32,12 @@ CODEBLOCKS_FILES= \ codeblocks/setup-res.rc DATA_FILES= \ + data/README \ data/doom.ico \ + data/doom8.ico \ data/doom.png \ data/setup.ico \ + data/setup8.ico \ data/setup.png \ data/convert-icon @@ -43,11 +46,13 @@ EXTRA_DIST= \ $(MSVC_FILES) \ $(CODEBLOCKS_FILES) \ $(DATA_FILES) \ + .lvimrc \ config.h \ CMDLINE \ HACKING \ TODO \ - BUGS + BUGS \ + rpm.spec MAINTAINERCLEANFILES = $(AUX_DIST_GEN) @@ -57,6 +62,8 @@ DIST_SUBDIRS=pkg $(SUBDIRS) if HAVE_PYTHON +noinst_DATA=CMDLINE + CMDLINE : src/ ./man/docgen -p man/CMDLINE.template src/ > $@ |