Skip to content

Commit

Permalink
Applied Paul Jenner's patches to fix "make distcheck" and "make rpm"
Browse files Browse the repository at this point in the history
  • Loading branch information
slouken committed Aug 9, 2001
1 parent 31f1f6d commit 591d020
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Makefile.am
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ EXTRA_DIST = \
WhatsNew \ WhatsNew \
docs.html \ docs.html \
sdl.m4 \ sdl.m4 \
SDL.spec \
autogen.sh \ autogen.sh \
strip_fPIC.sh strip_fPIC.sh


Expand All @@ -48,8 +49,7 @@ $(PACKAGE)-$(VERSION).tar.gz: dist


# Rule to build RPM distribution package # Rule to build RPM distribution package
rpm: $(PACKAGE)-$(VERSION).tar.gz rpm: $(PACKAGE)-$(VERSION).tar.gz
cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/redhat/SOURCES rpm -ta $(PACKAGE)-$(VERSION).tar.gz
rpm -ba SDL.spec


# Rule to rebuild the export lists for BeOS, MacOS and Win32. # Rule to rebuild the export lists for BeOS, MacOS and Win32.
exports: exports:
Expand Down Expand Up @@ -79,7 +79,7 @@ install-hook:
# Grab the test programs for the distribution: # Grab the test programs for the distribution:
dist-hook: dist-hook:
if test -f test/Makefile; then (cd test; make distclean); fi if test -f test/Makefile; then (cd test; make distclean); fi
cp -rp test $(distdir) cp -rp $(srcdir)/test $(distdir)
rm -rf `find $(distdir) -type d -name CVS -print` rm -rf `find $(distdir) -type d -name CVS -print`


# Create a CVS snapshot that people can run update -d on # Create a CVS snapshot that people can run update -d on
Expand Down
4 changes: 3 additions & 1 deletion src/cdrom/Makefile.am
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@


noinst_LTLIBRARIES = libcdrom.la noinst_LTLIBRARIES = libcdrom.la


ARCH_SUBDIRS = dummy beos freebsd linux macos openbsd qnx win32 ARCH_SUBDIRS = $(srcdir)/dummy $(srcdir)/beos $(srcdir)/freebsd \
$(srcdir)/linux $(srcdir)/macos $(srcdir)/openbsd \
$(srcdir)/qnx $(srcdir)/win32


# Include the architecture-independent sources # Include the architecture-independent sources
COMMON_SRCS = SDL_cdrom.c SDL_syscdrom.h COMMON_SRCS = SDL_cdrom.c SDL_syscdrom.h
Expand Down
3 changes: 2 additions & 1 deletion src/main/Makefile.am
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
# This is necessary because some platforms have special program # This is necessary because some platforms have special program
# entry points, which require special application initialization. # entry points, which require special application initialization.


ARCH_SUBDIRS = beos linux macos win32 ARCH_SUBDIRS = $(srcdir)/beos $(srcdir)/linux $(srcdir)/macos \
$(srcdir)/win32


# Build a separate library containing the main() entry point. # Build a separate library containing the main() entry point.
lib_LIBRARIES = libSDLmain.a lib_LIBRARIES = libSDLmain.a
Expand Down
3 changes: 2 additions & 1 deletion src/thread/Makefile.am
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@


noinst_LTLIBRARIES = libthread.la noinst_LTLIBRARIES = libthread.la


ARCH_SUBDIRS = generic amigaos beos irix linux win32 ARCH_SUBDIRS = $(srcdir)/generic $(srcdir)/amigaos $(srcdir)/beos \
$(srcdir)/irix $(srcdir)/linux $(srcdir)/win32


# Older versions of Linux require an asm clone() implementation # Older versions of Linux require an asm clone() implementation
if USE_CLONE if USE_CLONE
Expand Down
3 changes: 2 additions & 1 deletion src/timer/Makefile.am
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@


noinst_LTLIBRARIES = libtimer.la noinst_LTLIBRARIES = libtimer.la


ARCH_SUBDIRS = amigaos beos linux macos win32 ARCH_SUBDIRS = $(srcdir)/amigaos $(srcdir)/beos $(srcdir)/linux \
$(srcdir)/macos $(srcdir)/win32


# Include the architecture-independent sources # Include the architecture-independent sources
COMMON_SRCS = SDL_timer.c SDL_timer_c.h SDL_systimer.h COMMON_SRCS = SDL_timer.c SDL_timer_c.h SDL_systimer.h
Expand Down

0 comments on commit 591d020

Please sign in to comment.