commit cc9c4ef3809934868e799967b04bcc23fa9a24b5
Author: Mike Swanson <mikeonthecomputer@gmail.com>
AuthorDate: Tue Jun 5 10:39:25 2018 -0700
Commit: Mike Swanson <mikeonthecomputer@gmail.com>
CommitDate: Tue Jun 5 10:41:38 2018 -0700
Makefile.am: add CMakeLists.txt and win32 to EXTRA_DIST
Closes: #1055
---
Makefile.am | 15 +++++++++++++--
midiproc/Makefile.am | 2 ++
opl/Makefile.am | 2 ++
pcsound/Makefile.am | 2 ++
src/Makefile.am | 1 +
src/doom/Makefile.am | 2 ++
src/heretic/Makefile.am | 2 ++
src/hexen/Makefile.am | 2 ++
src/setup/Makefile.am | 1 +
src/strife/Makefile.am | 2 ++
textscreen/Makefile.am | 2 +-
11 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 17c71df7..d18e76bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,15 @@ AUX_DIST_GEN = \
$(ac_aux_dir)/install-sh \
$(ac_aux_dir)/missing
+CMAKE_FILES= \
+ CMakeLists.txt \
+ cmake/FindSDL2.cmake \
+ cmake/FindSDL2_mixer.cmake \
+ cmake/FindSDL2_net.cmake \
+ cmake/Findm.cmake \
+ cmake/Findsamplerate.cmake \
+ cmake/config.h.cin
+
CODEBLOCKS_FILES= \
codeblocks/chocolate.workspace \
codeblocks/config.h \
@@ -28,6 +37,7 @@ DOC_FILES= \
EXTRA_DIST= \
$(AUX_DIST_GEN) \
+ $(CMAKE_FILES) \
$(CODEBLOCKS_FILES) \
$(DOC_FILES) \
NOT-BUGS.md \
@@ -35,7 +45,9 @@ EXTRA_DIST= \
.lvimrc \
HACKING.md \
TODO.md \
- rpm.spec
+ rpm.spec \
+ win32/win_opendir.c \
+ win32/win_opendir.h
doomdocsdir = ${docdir}/../${PROGRAM_PREFIX}doom
doomdocs_DATA = $(DOC_FILES) NOT-BUGS.md
@@ -64,4 +76,3 @@ INSTALL : man/INSTALL.template man/simplecpp
< man/INSTALL.template > $@
endif
-
diff --git a/midiproc/Makefile.am b/midiproc/Makefile.am
index 0ac60b9b..88576eee 100644
--- a/midiproc/Makefile.am
+++ b/midiproc/Makefile.am
@@ -1,6 +1,8 @@
AM_CFLAGS=-I$(top_srcdir)/src @SDLMIXER_CFLAGS@
+EXTRA_DIST=CMakeLists.txt
+
if HAVE_WINDRES
noinst_PROGRAMS = @PROGRAM_PREFIX@midiproc
diff --git a/opl/Makefile.am b/opl/Makefile.am
index b0ed22bf..430953e3 100644
--- a/opl/Makefile.am
+++ b/opl/Makefile.am
@@ -1,6 +1,8 @@
AM_CFLAGS=@SDLMIXER_CFLAGS@
+EXTRA_DIST=CMakeLists.txt
+
SUBDIRS = . examples
noinst_LIBRARIES=libopl.a
diff --git a/pcsound/Makefile.am b/pcsound/Makefile.am
index b956a886..12b2ae49 100644
--- a/pcsound/Makefile.am
+++ b/pcsound/Makefile.am
@@ -1,6 +1,8 @@
AM_CFLAGS=@SDLMIXER_CFLAGS@
+EXTRA_DIST=CMakeLists.txt
+
noinst_LIBRARIES=libpcsound.a
libpcsound_a_SOURCES = \
diff --git a/src/Makefile.am b/src/Makefile.am
index 04474ab3..3e72cd6d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -208,6 +208,7 @@ endif
@LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@
EXTRA_DIST = \
+ CMakeLists.txt \
icon.c \
doom-screensaver.desktop.in \
manifest.xml
diff --git a/src/doom/Makefile.am b/src/doom/Makefile.am
index cbb859d0..89ca2b42 100644
--- a/src/doom/Makefile.am
+++ b/src/doom/Makefile.am
@@ -1,5 +1,7 @@
AM_CFLAGS = -I$(top_srcdir)/src @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES=libdoom.a
libdoom_a_SOURCES = \
diff --git a/src/heretic/Makefile.am b/src/heretic/Makefile.am
index 273688c3..0cc77a90 100644
--- a/src/heretic/Makefile.am
+++ b/src/heretic/Makefile.am
@@ -3,6 +3,8 @@ AM_CFLAGS=-I$(top_srcdir)/src \
-I$(top_srcdir)/textscreen \
@SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES=libheretic.a
libheretic_a_SOURCES = \
diff --git a/src/hexen/Makefile.am b/src/hexen/Makefile.am
index c2bd1255..c297d9e1 100644
--- a/src/hexen/Makefile.am
+++ b/src/hexen/Makefile.am
@@ -1,5 +1,7 @@
AM_CFLAGS=-I$(top_srcdir)/src @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES=libhexen.a
libhexen_a_SOURCES = \
diff --git a/src/setup/Makefile.am b/src/setup/Makefile.am
index 2867f8b3..76db29cf 100644
--- a/src/setup/Makefile.am
+++ b/src/setup/Makefile.am
@@ -22,6 +22,7 @@ libsetup_a_SOURCES = \
txt_mouseinput.c txt_mouseinput.h
EXTRA_DIST= \
+ CMakeLists.txt \
setup_icon.c
appdir = $(prefix)/share/applications
diff --git a/src/strife/Makefile.am b/src/strife/Makefile.am
index 7a4718b4..6648b525 100644
--- a/src/strife/Makefile.am
+++ b/src/strife/Makefile.am
@@ -2,6 +2,8 @@ AM_CFLAGS=-I$(top_srcdir)/src \
-I$(top_srcdir)/textscreen \
@SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
+EXTRA_DIST = CMakeLists.txt
+
noinst_LIBRARIES=libstrife.a
libstrife_a_SOURCES = \
diff --git a/textscreen/Makefile.am b/textscreen/Makefile.am
index fa479bb3..f55236f6 100644
--- a/textscreen/Makefile.am
+++ b/textscreen/Makefile.am
@@ -9,7 +9,7 @@ SUBDIRS = fonts . examples
noinst_LIBRARIES=libtextscreen.a
-EXTRA_DIST=Doxyfile
+EXTRA_DIST=CMakeLists.txt Doxyfile
libtextscreen_a_SOURCES = \
textscreen.h \