Applied Paul Jenner's patches to fix "make distcheck" and "make rpm"
authorSam Lantinga <slouken@libsdl.org>
Thu, 09 Aug 2001 05:31:32 +0000
changeset 13869ee0b88b615
parent 137 4738ea544d7a
child 139 ef23a1bf1244
Applied Paul Jenner's patches to fix "make distcheck" and "make rpm"
Makefile.am
src/cdrom/Makefile.am
src/main/Makefile.am
src/thread/Makefile.am
src/timer/Makefile.am
     1.1 --- a/Makefile.am	Fri Aug 03 05:51:33 2001 +0000
     1.2 +++ b/Makefile.am	Thu Aug 09 05:31:32 2001 +0000
     1.3 @@ -36,6 +36,7 @@
     1.4          WhatsNew	\
     1.5          docs.html	\
     1.6          sdl.m4		\
     1.7 +        SDL.spec	\
     1.8          autogen.sh	\
     1.9          strip_fPIC.sh
    1.10  
    1.11 @@ -48,8 +49,7 @@
    1.12  
    1.13  # Rule to build RPM distribution package
    1.14  rpm: $(PACKAGE)-$(VERSION).tar.gz
    1.15 -	cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/redhat/SOURCES
    1.16 -	rpm -ba SDL.spec
    1.17 +	rpm -ta $(PACKAGE)-$(VERSION).tar.gz
    1.18  
    1.19  # Rule to rebuild the export lists for BeOS, MacOS and Win32.
    1.20  exports:
    1.21 @@ -79,7 +79,7 @@
    1.22  # Grab the test programs for the distribution:
    1.23  dist-hook:
    1.24  	if test -f test/Makefile; then (cd test; make distclean); fi
    1.25 -	cp -rp test $(distdir)
    1.26 +	cp -rp $(srcdir)/test $(distdir)
    1.27  	rm -rf `find $(distdir) -type d -name CVS -print`
    1.28  
    1.29  # Create a CVS snapshot that people can run update -d on
     2.1 --- a/src/cdrom/Makefile.am	Fri Aug 03 05:51:33 2001 +0000
     2.2 +++ b/src/cdrom/Makefile.am	Thu Aug 09 05:31:32 2001 +0000
     2.3 @@ -3,7 +3,9 @@
     2.4  
     2.5  noinst_LTLIBRARIES = libcdrom.la
     2.6  
     2.7 -ARCH_SUBDIRS = dummy beos freebsd linux macos openbsd qnx win32
     2.8 +ARCH_SUBDIRS = $(srcdir)/dummy $(srcdir)/beos $(srcdir)/freebsd \
     2.9 +	$(srcdir)/linux $(srcdir)/macos $(srcdir)/openbsd \
    2.10 +	$(srcdir)/qnx $(srcdir)/win32
    2.11  
    2.12  # Include the architecture-independent sources
    2.13  COMMON_SRCS = SDL_cdrom.c SDL_syscdrom.h
     3.1 --- a/src/main/Makefile.am	Fri Aug 03 05:51:33 2001 +0000
     3.2 +++ b/src/main/Makefile.am	Thu Aug 09 05:31:32 2001 +0000
     3.3 @@ -4,7 +4,8 @@
     3.4  # This is necessary because some platforms have special program
     3.5  # entry points, which require special application initialization.
     3.6  
     3.7 -ARCH_SUBDIRS = beos linux macos win32
     3.8 +ARCH_SUBDIRS = $(srcdir)/beos $(srcdir)/linux $(srcdir)/macos \
     3.9 +	$(srcdir)/win32
    3.10  
    3.11  # Build a separate library containing the main() entry point.
    3.12  lib_LIBRARIES = libSDLmain.a
     4.1 --- a/src/thread/Makefile.am	Fri Aug 03 05:51:33 2001 +0000
     4.2 +++ b/src/thread/Makefile.am	Thu Aug 09 05:31:32 2001 +0000
     4.3 @@ -3,7 +3,8 @@
     4.4  
     4.5  noinst_LTLIBRARIES = libthread.la
     4.6  
     4.7 -ARCH_SUBDIRS = generic amigaos beos irix linux win32
     4.8 +ARCH_SUBDIRS = $(srcdir)/generic $(srcdir)/amigaos $(srcdir)/beos \
     4.9 +	$(srcdir)/irix $(srcdir)/linux $(srcdir)/win32
    4.10  
    4.11  # Older versions of Linux require an asm clone() implementation
    4.12  if USE_CLONE
     5.1 --- a/src/timer/Makefile.am	Fri Aug 03 05:51:33 2001 +0000
     5.2 +++ b/src/timer/Makefile.am	Thu Aug 09 05:31:32 2001 +0000
     5.3 @@ -3,7 +3,8 @@
     5.4  
     5.5  noinst_LTLIBRARIES = libtimer.la
     5.6  
     5.7 -ARCH_SUBDIRS = amigaos beos linux macos win32
     5.8 +ARCH_SUBDIRS = $(srcdir)/amigaos $(srcdir)/beos $(srcdir)/linux \
     5.9 +	$(srcdir)/macos $(srcdir)/win32
    5.10  
    5.11  # Include the architecture-independent sources
    5.12  COMMON_SRCS = SDL_timer.c SDL_timer_c.h SDL_systimer.h