shithub: choc

Download patch

ref: cc9c4ef3809934868e799967b04bcc23fa9a24b5
parent: a0056875827f1e6efb74834cc8ac051ecc2d765c
author: Mike Swanson <mikeonthecomputer@gmail.com>
date: Tue Jun 5 06:39:25 EDT 2018 

Makefile.am: add CMakeLists.txt and win32 to EXTRA_DIST

Closes: #1055


--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,15 @@
         $(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 @@
 
 EXTRA_DIST=                             \
         $(AUX_DIST_GEN)                 \
+        $(CMAKE_FILES)                  \
         $(CODEBLOCKS_FILES)             \
         $(DOC_FILES)                    \
         NOT-BUGS.md                     \
@@ -35,7 +45,9 @@
         .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 @@
 	                < man/INSTALL.template > $@
 
 endif
-
--- 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
--- 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
--- 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 =                            \
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -208,6 +208,7 @@
                         @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@
 
 EXTRA_DIST =                        \
+        CMakeLists.txt              \
         icon.c                      \
         doom-screensaver.desktop.in \
         manifest.xml
--- 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 =             \
--- a/src/heretic/Makefile.am
+++ b/src/heretic/Makefile.am
@@ -3,6 +3,8 @@
           -I$(top_srcdir)/textscreen                    \
           @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
 
+EXTRA_DIST = CMakeLists.txt
+
 noinst_LIBRARIES=libheretic.a
 
 libheretic_a_SOURCES =                               \
--- 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 =                  \
--- a/src/setup/Makefile.am
+++ b/src/setup/Makefile.am
@@ -22,6 +22,7 @@
     txt_mouseinput.c  txt_mouseinput.h
 
 EXTRA_DIST=                                     \
+    CMakeLists.txt                              \
     setup_icon.c
 
 appdir = $(prefix)/share/applications
--- a/src/strife/Makefile.am
+++ b/src/strife/Makefile.am
@@ -2,6 +2,8 @@
           -I$(top_srcdir)/textscreen                    \
           @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
 
+EXTRA_DIST = CMakeLists.txt
+
 noinst_LIBRARIES=libstrife.a
 
 libstrife_a_SOURCES =           \
--- a/textscreen/Makefile.am
+++ b/textscreen/Makefile.am
@@ -9,7 +9,7 @@
 
 noinst_LIBRARIES=libtextscreen.a
 
-EXTRA_DIST=Doxyfile
+EXTRA_DIST=CMakeLists.txt Doxyfile
 
 libtextscreen_a_SOURCES =                                 \
 	textscreen.h                                      \