Fixed bug #171
authorSam Lantinga <slouken@libsdl.org>
Thu, 23 Mar 2006 21:28:33 +0000
changeset 160364710b9f3eeb
parent 1602 cd97a8e39874
child 1604 bfba1ea4452a
Fixed bug #171
SDL_config.h is no longer in CVS. Instead, configure will generate it for
systems that use configure, and we always copy SDL_config.h.default to
SDL_config.h before generating a snapshot or release archive.

Also fixed a couple of uninstall issues.
Makefile.in
Makefile.minimal
include/.cvsignore
include/SDL_config.h
include/SDL_config.h.default
include/SDL_config.h.minimal
include/SDL_config_minimal.h
     1.1 --- a/Makefile.in	Thu Mar 23 17:31:12 2006 +0000
     1.2 +++ b/Makefile.in	Thu Mar 23 21:28:33 2006 +0000
     1.3 @@ -99,7 +99,7 @@
     1.4  	    $(INSTALL) -m 644 $$src $(mandir)/man3/$$file; \
     1.5  	done
     1.6  
     1.7 -uninstall: uninstall-bin uninstall-hdrs uninstall-lib uninstall-man
     1.8 +uninstall: uninstall-bin uninstall-hdrs uninstall-lib uninstall-data uninstall-man
     1.9  uninstall-bin:
    1.10  	rm -f $(bindir)/sdl-config
    1.11  uninstall-hdrs:
    1.12 @@ -108,6 +108,7 @@
    1.13  	    rm -f $(includedir)/SDL/$$file; \
    1.14  	done
    1.15  	rm -f $(includedir)/SDL/SDL_config.h
    1.16 +	-rmdir $(includedir)/SDL
    1.17  uninstall-lib:
    1.18  	$(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(TARGET)
    1.19  	rm -f $(libdir)/$(SDLMAIN_TARGET)
    1.20 @@ -125,19 +126,25 @@
    1.21  
    1.22  distclean: clean
    1.23  	rm -f Makefile include/SDL_config.h sdl-config
    1.24 +	rm -f include/SDL_config.h sdl-config
    1.25  	rm -f SDL.qpg
    1.26  	rm -f config.status config.cache config.log libtool $(depend)
    1.27  	rm -rf $(srcdir)/autom4te*
    1.28 -	find $(srcdir) \
    1.29 -	    -name '*~' -o -name '*.bak' -o -name '*.old' -o -name '*.rej' -o \
    1.30 -	    -name '.#*' \
    1.31 +	find $(srcdir) \( \
    1.32 +	    -name '*~' -o \
    1.33 +	    -name '*.bak' -o \
    1.34 +	    -name '*.old' -o \
    1.35 +	    -name '*.rej' -o \
    1.36 +	    -name '*.orig' -o \
    1.37 +	    -name '.#*' \) \
    1.38  	    -exec rm -f {} \;
    1.39 -	cp $(srcdir)/include/SDL_config.h.minimal $(srcdir)/include/SDL_config.h
    1.40 +	cp $(srcdir)/include/SDL_config.h.default $(srcdir)/include/SDL_config.h
    1.41  	if test -f test/Makefile; then (cd test; $(MAKE) $@); fi
    1.42  
    1.43  dist $(distfile):
    1.44  	$(SHELL) $(auxdir)/mkinstalldirs $(distdir)
    1.45  	tar cf - $(DIST) | (cd $(distdir); tar xf -)
    1.46 +	cp $(distdir)/include/SDL_config.h.default $(distdir)/include/SDL_config.h
    1.47  	rm -rf `find $(distdir) -name CVS`
    1.48  	rm -f `find $(distdir) -name '.cvsignore'`
    1.49  	rm -f `find $(distdir) -name '.#*'`
    1.50 @@ -154,6 +161,7 @@
    1.51  	cvs -d $(CVSROOT) login
    1.52  	cvs -d $(CVSROOT) checkout -P SDL12
    1.53  	(cd SDL12 && ./autogen.sh && rm -rf autom4te.cache)
    1.54 +	cp SDL12/include/SDL_config.h.default SDL12/include/SDL_config.h
    1.55  	mv SDL12 SDL-1.2
    1.56  	tar zcf $(HOME)/SDL-1.2.tar.gz SDL-1.2
    1.57  	rm -f $(HOME)/SDL-1.2.zip
     2.1 --- a/Makefile.minimal	Thu Mar 23 17:31:12 2006 +0000
     2.2 +++ b/Makefile.minimal	Thu Mar 23 21:28:33 2006 +0000
     2.3 @@ -5,6 +5,7 @@
     2.4  AR	= ar
     2.5  RANLIB	= ranlib
     2.6  
     2.7 +CONFIG_H = include/SDL_config.h
     2.8  TARGET  = libSDL.a
     2.9  SOURCES = \
    2.10  	src/*.c \
    2.11 @@ -30,9 +31,12 @@
    2.12  
    2.13  all: $(TARGET)
    2.14  
    2.15 -$(TARGET): $(OBJECTS)
    2.16 +$(TARGET): $(CONFIG_H) $(OBJECTS)
    2.17  	$(AR) crv $@ $^
    2.18  	$(RANLIB) $@
    2.19  
    2.20 +$(CONFIG_H):
    2.21 +	cp $(CONFIG_H).default $(CONFIG_H)
    2.22 +
    2.23  clean:
    2.24  	rm -f $(TARGET) $(OBJECTS)
     3.1 --- a/include/.cvsignore	Thu Mar 23 17:31:12 2006 +0000
     3.2 +++ b/include/.cvsignore	Thu Mar 23 21:28:33 2006 +0000
     3.3 @@ -1,2 +1,3 @@
     3.4  Makefile.in
     3.5  Makefile
     3.6 +SDL_config.h
     4.1 --- a/include/SDL_config.h	Thu Mar 23 17:31:12 2006 +0000
     4.2 +++ b/include/SDL_config.h	Thu Mar 23 21:28:33 2006 +0000
     4.3 @@ -39,40 +39,7 @@
     4.4  #elif defined(__OS2__)
     4.5  #include "SDL_config_os2.h"
     4.6  #else
     4.7 -/* This is the minimal configuration that can be used to build SDL */
     4.8 -
     4.9 -#include <stdarg.h>
    4.10 -
    4.11 -typedef signed char int8_t;
    4.12 -typedef unsigned char uint8_t;
    4.13 -typedef signed short int16_t;
    4.14 -typedef unsigned short uint16_t;
    4.15 -typedef signed int int32_t;
    4.16 -typedef unsigned int uint32_t;
    4.17 -typedef unsigned int size_t;
    4.18 -typedef unsigned long uintptr_t;
    4.19 -
    4.20 -/* Enable the dummy audio driver (src/audio/dummy/\*.c) */
    4.21 -#define SDL_AUDIO_DRIVER_DUMMY	1
    4.22 -
    4.23 -/* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */
    4.24 -#define SDL_CDROM_DISABLED	1
    4.25 -
    4.26 -/* Enable the stub joystick driver (src/joystick/dummy/\*.c) */
    4.27 -#define SDL_JOYSTICK_DISABLED	1
    4.28 -
    4.29 -/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
    4.30 -#define SDL_LOADSO_DISABLED	1
    4.31 -
    4.32 -/* Enable the stub thread support (src/thread/generic/\*.c) */
    4.33 -#define SDL_THREADS_DISABLED	1
    4.34 -
    4.35 -/* Enable the stub timer support (src/timer/dummy/\*.c) */
    4.36 -#define SDL_TIMERS_DISABLED	1
    4.37 -
    4.38 -/* Enable the dummy video driver (src/video/dummy/\*.c) */
    4.39 -#define SDL_VIDEO_DRIVER_DUMMY	1
    4.40 -
    4.41 +#include "SDL_config_minimal.h"
    4.42  #endif /* platform config */
    4.43  
    4.44  #endif /* _SDL_config_h */
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/include/SDL_config.h.default	Thu Mar 23 21:28:33 2006 +0000
     5.3 @@ -0,0 +1,45 @@
     5.4 +/*
     5.5 +    SDL - Simple DirectMedia Layer
     5.6 +    Copyright (C) 1997-2006 Sam Lantinga
     5.7 +
     5.8 +    This library is free software; you can redistribute it and/or
     5.9 +    modify it under the terms of the GNU Lesser General Public
    5.10 +    License as published by the Free Software Foundation; either
    5.11 +    version 2.1 of the License, or (at your option) any later version.
    5.12 +
    5.13 +    This library is distributed in the hope that it will be useful,
    5.14 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
    5.15 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    5.16 +    Lesser General Public License for more details.
    5.17 +
    5.18 +    You should have received a copy of the GNU Lesser General Public
    5.19 +    License along with this library; if not, write to the Free Software
    5.20 +    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    5.21 +
    5.22 +    Sam Lantinga
    5.23 +    slouken@libsdl.org
    5.24 +*/
    5.25 +
    5.26 +#ifndef _SDL_config_h
    5.27 +#define _SDL_config_h
    5.28 +
    5.29 +#include "SDL_platform.h"
    5.30 +
    5.31 +/* Add any platform that doesn't build using the configure system */
    5.32 +#if defined(__AMIGA__)
    5.33 +#include "SDL_config_amiga.h"
    5.34 +#elif defined(__DREAMCAST__)
    5.35 +#include "SDL_config_dreamcast.h"
    5.36 +#elif defined(__MACOS__)
    5.37 +#include "SDL_config_macos.h"
    5.38 +#elif defined(__MACOSX__)
    5.39 +#include "SDL_config_macosx.h"
    5.40 +#elif defined(__WIN32__)
    5.41 +#include "SDL_config_win32.h"
    5.42 +#elif defined(__OS2__)
    5.43 +#include "SDL_config_os2.h"
    5.44 +#else
    5.45 +#include "SDL_config_minimal.h"
    5.46 +#endif /* platform config */
    5.47 +
    5.48 +#endif /* _SDL_config_h */
     6.1 --- a/include/SDL_config.h.minimal	Thu Mar 23 17:31:12 2006 +0000
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,78 +0,0 @@
     6.4 -/*
     6.5 -    SDL - Simple DirectMedia Layer
     6.6 -    Copyright (C) 1997-2006 Sam Lantinga
     6.7 -
     6.8 -    This library is free software; you can redistribute it and/or
     6.9 -    modify it under the terms of the GNU Lesser General Public
    6.10 -    License as published by the Free Software Foundation; either
    6.11 -    version 2.1 of the License, or (at your option) any later version.
    6.12 -
    6.13 -    This library is distributed in the hope that it will be useful,
    6.14 -    but WITHOUT ANY WARRANTY; without even the implied warranty of
    6.15 -    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    6.16 -    Lesser General Public License for more details.
    6.17 -
    6.18 -    You should have received a copy of the GNU Lesser General Public
    6.19 -    License along with this library; if not, write to the Free Software
    6.20 -    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    6.21 -
    6.22 -    Sam Lantinga
    6.23 -    slouken@libsdl.org
    6.24 -*/
    6.25 -
    6.26 -#ifndef _SDL_config_h
    6.27 -#define _SDL_config_h
    6.28 -
    6.29 -#include "SDL_platform.h"
    6.30 -
    6.31 -/* Add any platform that doesn't build using the configure system */
    6.32 -#if defined(__AMIGA__)
    6.33 -#include "SDL_config_amiga.h"
    6.34 -#elif defined(__DREAMCAST__)
    6.35 -#include "SDL_config_dreamcast.h"
    6.36 -#elif defined(__MACOS__)
    6.37 -#include "SDL_config_macos.h"
    6.38 -#elif defined(__MACOSX__)
    6.39 -#include "SDL_config_macosx.h"
    6.40 -#elif defined(__WIN32__)
    6.41 -#include "SDL_config_win32.h"
    6.42 -#elif defined(__OS2__)
    6.43 -#include "SDL_config_os2.h"
    6.44 -#else
    6.45 -/* This is the minimal configuration that can be used to build SDL */
    6.46 -
    6.47 -#include <stdarg.h>
    6.48 -
    6.49 -typedef signed char int8_t;
    6.50 -typedef unsigned char uint8_t;
    6.51 -typedef signed short int16_t;
    6.52 -typedef unsigned short uint16_t;
    6.53 -typedef signed int int32_t;
    6.54 -typedef unsigned int uint32_t;
    6.55 -typedef unsigned int size_t;
    6.56 -typedef unsigned long uintptr_t;
    6.57 -
    6.58 -/* Enable the dummy audio driver (src/audio/dummy/\*.c) */
    6.59 -#define SDL_AUDIO_DRIVER_DUMMY	1
    6.60 -
    6.61 -/* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */
    6.62 -#define SDL_CDROM_DISABLED	1
    6.63 -
    6.64 -/* Enable the stub joystick driver (src/joystick/dummy/\*.c) */
    6.65 -#define SDL_JOYSTICK_DISABLED	1
    6.66 -
    6.67 -/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
    6.68 -#define SDL_LOADSO_DISABLED	1
    6.69 -
    6.70 -/* Enable the stub thread support (src/thread/generic/\*.c) */
    6.71 -#define SDL_THREADS_DISABLED	1
    6.72 -
    6.73 -/* Enable the stub timer support (src/timer/dummy/\*.c) */
    6.74 -#define SDL_TIMERS_DISABLED	1
    6.75 -
    6.76 -/* Enable the dummy video driver (src/video/dummy/\*.c) */
    6.77 -#define SDL_VIDEO_DRIVER_DUMMY	1
    6.78 -
    6.79 -#endif /* platform config */
    6.80 -
    6.81 -#endif /* _SDL_config_h */
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/include/SDL_config_minimal.h	Thu Mar 23 21:28:33 2006 +0000
     7.3 @@ -0,0 +1,60 @@
     7.4 +/*
     7.5 +    SDL - Simple DirectMedia Layer
     7.6 +    Copyright (C) 1997-2006 Sam Lantinga
     7.7 +
     7.8 +    This library is free software; you can redistribute it and/or
     7.9 +    modify it under the terms of the GNU Lesser General Public
    7.10 +    License as published by the Free Software Foundation; either
    7.11 +    version 2.1 of the License, or (at your option) any later version.
    7.12 +
    7.13 +    This library is distributed in the hope that it will be useful,
    7.14 +    but WITHOUT ANY WARRANTY; without even the implied warranty of
    7.15 +    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    7.16 +    Lesser General Public License for more details.
    7.17 +
    7.18 +    You should have received a copy of the GNU Lesser General Public
    7.19 +    License along with this library; if not, write to the Free Software
    7.20 +    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    7.21 +
    7.22 +    Sam Lantinga
    7.23 +    slouken@libsdl.org
    7.24 +*/
    7.25 +
    7.26 +#ifndef _SDL_config_minimal_h
    7.27 +#define _SDL_config_minimal_h
    7.28 +
    7.29 +/* This is the minimal configuration that can be used to build SDL */
    7.30 +
    7.31 +#include <stdarg.h>
    7.32 +
    7.33 +typedef signed char int8_t;
    7.34 +typedef unsigned char uint8_t;
    7.35 +typedef signed short int16_t;
    7.36 +typedef unsigned short uint16_t;
    7.37 +typedef signed int int32_t;
    7.38 +typedef unsigned int uint32_t;
    7.39 +typedef unsigned int size_t;
    7.40 +typedef unsigned long uintptr_t;
    7.41 +
    7.42 +/* Enable the dummy audio driver (src/audio/dummy/\*.c) */
    7.43 +#define SDL_AUDIO_DRIVER_DUMMY	1
    7.44 +
    7.45 +/* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */
    7.46 +#define SDL_CDROM_DISABLED	1
    7.47 +
    7.48 +/* Enable the stub joystick driver (src/joystick/dummy/\*.c) */
    7.49 +#define SDL_JOYSTICK_DISABLED	1
    7.50 +
    7.51 +/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
    7.52 +#define SDL_LOADSO_DISABLED	1
    7.53 +
    7.54 +/* Enable the stub thread support (src/thread/generic/\*.c) */
    7.55 +#define SDL_THREADS_DISABLED	1
    7.56 +
    7.57 +/* Enable the stub timer support (src/timer/dummy/\*.c) */
    7.58 +#define SDL_TIMERS_DISABLED	1
    7.59 +
    7.60 +/* Enable the dummy video driver (src/video/dummy/\*.c) */
    7.61 +#define SDL_VIDEO_DRIVER_DUMMY	1
    7.62 +
    7.63 +#endif /* _SDL_config_minimal_h */