annotate Makefile.in @ 5082:de59e0218aa2

Fixed bug #1011 Daniel Ellis 2010-06-25 15:20:31 PDT SDL based applications sometimes display the wrong application name in the Sound Preferences dialog when using pulseaudio. I can see from the code that the SDL pulse module is initiating a new pulse audio context and passing an application name using the function get_progname(). The get_progname() function returns the name of the current process. However, the process name is often not a suitable name to use. For example, the OpenShot video editor is a python application, and so "python" is displayed in the Sound Preferences window (see Bug #596504), when it should be displaying "OpenShot". PulseAudio allows applications to specify the application name, either at the time the context is created (as SDL does currently), or by special environment variables (see http://www.pulseaudio.org/wiki/ApplicationProperties). If no name is specified, then pulseaudio will determine the name based on the process. If you specify the application name when initiating the pulseaudio context, then that will override any application name specified using an environment variable. As libsdl is a library, I believe the solution is for libsdl to not specify any application name when initiating a pulseaudio context, which will enable applications to specify the application name using environment variables. In the case that the applications do not specify anything, pulseaudio will fall back to using the process name anyway. The attached patch removes the get_progname() function and passes NULL as the application name when creating the pulseaudio context, which fixes the issue.
author Sam Lantinga <slouken@libsdl.org>
date Sun, 23 Jan 2011 21:55:04 -0800
parents 3afb71c202b2
children da10636e5eca
rev   line source
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
1 # Makefile to build and install the SDL library
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
2
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
3 top_builddir = .
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
4 srcdir = @srcdir@
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
5 objects = build
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
6 prefix = @prefix@
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
7 exec_prefix = @exec_prefix@
2156
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
8 bindir = @bindir@
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
9 libdir = @libdir@
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
10 includedir = @includedir@
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
11 datarootdir = @datarootdir@
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
12 datadir = @datadir@
1391
7dc446173e37 Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents: 1390
diff changeset
13 auxdir = @ac_aux_dir@
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
14 distpath = $(srcdir)/..
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
15 distdir = SDL-@SDL_VERSION@
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
16 distfile = $(distdir).tar.gz
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
17
1380
d94b080ff6ce Completely removed dependency on automake
Sam Lantinga <slouken@libsdl.org>
parents: 1362
diff changeset
18 @SET_MAKE@
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
19 SHELL = @SHELL@
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
20 CC = @CC@
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
21 INCLUDE = @INCLUDE@
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
22 CFLAGS = @BUILD_CFLAGS@
1521
9b9212e4810c CFLAGS are separate from EXTRA_CFLAGS
Sam Lantinga <slouken@libsdl.org>
parents: 1494
diff changeset
23 EXTRA_CFLAGS = @EXTRA_CFLAGS@
1393
cd3362657144 Pass LDFLAGS to the build system
Sam Lantinga <slouken@libsdl.org>
parents: 1391
diff changeset
24 LDFLAGS = @BUILD_LDFLAGS@
1521
9b9212e4810c CFLAGS are separate from EXTRA_CFLAGS
Sam Lantinga <slouken@libsdl.org>
parents: 1494
diff changeset
25 EXTRA_LDFLAGS = @EXTRA_LDFLAGS@
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
26 LIBTOOL = @LIBTOOL@
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
27 INSTALL = @INSTALL@
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
28 NASM = @NASM@ @NASMFLAGS@
1419
36a5068bf7df *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents: 1414
diff changeset
29 AR = @AR@
36a5068bf7df *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents: 1414
diff changeset
30 RANLIB = @RANLIB@
2204
9f64d06fa168 Added support for building version.rc in Windows build.
Sam Lantinga <slouken@libsdl.org>
parents: 2156
diff changeset
31 WINDRES = @WINDRES@
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
32
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
33 TARGET = libSDL.la
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
34 OBJECTS = @OBJECTS@
3334
61ea9005fddf Use gcc's built-in dependency generation, thanks to Adam Strzelecki
Sam Lantinga <slouken@libsdl.org>
parents: 3311
diff changeset
35 VERSION_OBJECTS = @VERSION_OBJECTS@
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
36
1397
b189a73aa335 Added rules to build libSDLmain.a
Sam Lantinga <slouken@libsdl.org>
parents: 1394
diff changeset
37 SDLMAIN_TARGET = libSDLmain.a
b189a73aa335 Added rules to build libSDLmain.a
Sam Lantinga <slouken@libsdl.org>
parents: 1394
diff changeset
38 SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
b189a73aa335 Added rules to build libSDLmain.a
Sam Lantinga <slouken@libsdl.org>
parents: 1394
diff changeset
39
4970
b9eed029844a Include the Android Makefile in the distribution files
Sam Lantinga <slouken@libsdl.org>
parents: 4929
diff changeset
40 DIST = acinclude Android.mk autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS include INSTALL Makefile.minimal Makefile.in README* sdl-config.in sdl.m4 sdl.pc.in SDL.spec SDL.spec.in src test TODO VisualC.html VisualC VisualCE Watcom-Win32.zip WhatsNew Xcode Xcode-iPhoneOS
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
41
4929
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
42 HDRS = \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
43 SDL.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
44 SDL_assert.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
45 SDL_atomic.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
46 SDL_audio.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
47 SDL_blendmode.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
48 SDL_clipboard.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
49 SDL_compat.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
50 SDL_cpuinfo.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
51 SDL_endian.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
52 SDL_error.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
53 SDL_events.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
54 SDL_gesture.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
55 SDL_haptic.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
56 SDL_input.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
57 SDL_joystick.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
58 SDL_keyboard.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
59 SDL_keysym.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
60 SDL_loadso.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
61 SDL_main.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
62 SDL_mouse.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
63 SDL_mutex.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
64 SDL_name.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
65 SDL_opengl.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
66 SDL_opengles.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
67 SDL_pixels.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
68 SDL_platform.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
69 SDL_power.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
70 SDL_quit.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
71 SDL_rect.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
72 SDL_revision.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
73 SDL_rwops.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
74 SDL_scalemode.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
75 SDL_scancode.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
76 SDL_shape.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
77 SDL_stdinc.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
78 SDL_surface.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
79 SDL_syswm.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
80 SDL_thread.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
81 SDL_timer.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
82 SDL_touch.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
83 SDL_types.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
84 SDL_version.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
85 SDL_video.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
86 begin_code.h \
aa8888658021 Use the enumerated type for blend and scale mode instead of int
Sam Lantinga <slouken@libsdl.org>
parents: 4862
diff changeset
87 close_code.h
2122
b15ffacb66d3 Don't install the extra SDL config headers or SDL_copying.h
Sam Lantinga <slouken@libsdl.org>
parents: 2083
diff changeset
88
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
89 LT_AGE = @LT_AGE@
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
90 LT_CURRENT = @LT_CURRENT@
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
91 LT_RELEASE = @LT_RELEASE@
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
92 LT_REVISION = @LT_REVISION@
2156
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
93 LT_LDFLAGS = -no-undefined -rpath $(DESTDIR)$(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
94
3311
0679e03ef8fa Fixed bug #704
Sam Lantinga <slouken@libsdl.org>
parents: 3272
diff changeset
95 all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
1622
5bbfc3e20e10 Fixed bug #191
Sam Lantinga <slouken@libsdl.org>
parents: 1603
diff changeset
96
5bbfc3e20e10 Fixed bug #191
Sam Lantinga <slouken@libsdl.org>
parents: 1603
diff changeset
97 $(srcdir)/configure: $(srcdir)/configure.in
5bbfc3e20e10 Fixed bug #191
Sam Lantinga <slouken@libsdl.org>
parents: 1603
diff changeset
98 @echo "Warning, configure.in is out of date"
5bbfc3e20e10 Fixed bug #191
Sam Lantinga <slouken@libsdl.org>
parents: 1603
diff changeset
99 #(cd $(srcdir) && sh autogen.sh && sh configure)
1623
09375aed0208 Added a delay so the warning message isn't accidentally missed.
Sam Lantinga <slouken@libsdl.org>
parents: 1622
diff changeset
100 @sleep 3
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
101
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
102 Makefile: $(srcdir)/Makefile.in
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
103 $(SHELL) config.status $@
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
104
3416
3d50171ac879 Adam Strzelecki to SDL
Sam Lantinga <slouken@libsdl.org>
parents: 3355
diff changeset
105 Makefile.in:;
3d50171ac879 Adam Strzelecki to SDL
Sam Lantinga <slouken@libsdl.org>
parents: 3355
diff changeset
106
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
107 $(objects):
1391
7dc446173e37 Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents: 1390
diff changeset
108 $(SHELL) $(auxdir)/mkinstalldirs $@
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
109
3311
0679e03ef8fa Fixed bug #704
Sam Lantinga <slouken@libsdl.org>
parents: 3272
diff changeset
110 # To make sure parallel builds will not fail
0679e03ef8fa Fixed bug #704
Sam Lantinga <slouken@libsdl.org>
parents: 3272
diff changeset
111 $(srcdir)/include/SDL_revision.h: update-revision
0679e03ef8fa Fixed bug #704
Sam Lantinga <slouken@libsdl.org>
parents: 3272
diff changeset
112
2982
b64c1d23039b Make the current revision number available
Sam Lantinga <slouken@libsdl.org>
parents: 2713
diff changeset
113 update-revision:
b64c1d23039b Make the current revision number available
Sam Lantinga <slouken@libsdl.org>
parents: 2713
diff changeset
114 $(SHELL) $(auxdir)/updaterev.sh
b64c1d23039b Make the current revision number available
Sam Lantinga <slouken@libsdl.org>
parents: 2713
diff changeset
115
3416
3d50171ac879 Adam Strzelecki to SDL
Sam Lantinga <slouken@libsdl.org>
parents: 3355
diff changeset
116 .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
117
3334
61ea9005fddf Use gcc's built-in dependency generation, thanks to Adam Strzelecki
Sam Lantinga <slouken@libsdl.org>
parents: 3311
diff changeset
118 $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
61ea9005fddf Use gcc's built-in dependency generation, thanks to Adam Strzelecki
Sam Lantinga <slouken@libsdl.org>
parents: 3311
diff changeset
119 $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
120
1397
b189a73aa335 Added rules to build libSDLmain.a
Sam Lantinga <slouken@libsdl.org>
parents: 1394
diff changeset
121 $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
1419
36a5068bf7df *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents: 1414
diff changeset
122 $(AR) cru $@ $(SDLMAIN_OBJECTS)
36a5068bf7df *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents: 1414
diff changeset
123 $(RANLIB) $@
1397
b189a73aa335 Added rules to build libSDLmain.a
Sam Lantinga <slouken@libsdl.org>
parents: 1394
diff changeset
124
3352
6dc250ebdd80 The SDL 1.3 documentation will be primarily online wiki based:
Sam Lantinga <slouken@libsdl.org>
parents: 3344
diff changeset
125 install: all install-bin install-hdrs install-lib install-data
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
126 install-bin:
2156
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
127 $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(bindir)
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
128 $(INSTALL) -m 755 sdl-config $(DESTDIR)$(bindir)/sdl-config
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
129 install-hdrs:
2156
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
130 $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(includedir)/SDL
2122
b15ffacb66d3 Don't install the extra SDL config headers or SDL_copying.h
Sam Lantinga <slouken@libsdl.org>
parents: 2083
diff changeset
131 for file in $(HDRS); do \
2156
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
132 $(INSTALL) -m 644 $(srcdir)/include/$$file $(DESTDIR)$(includedir)/SDL/$$file; \
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
133 done
2156
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
134 $(INSTALL) -m 644 include/SDL_config.h $(DESTDIR)$(includedir)/SDL/SDL_config.h
2151
1e0692271600 Fixed bug #436
Sam Lantinga <slouken@libsdl.org>
parents: 2126
diff changeset
135 install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
2156
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
136 $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
137 $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
138 $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
139 $(RANLIB) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
140 install-data:
2156
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
141 $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
142 $(INSTALL) -m 644 $(srcdir)/sdl.m4 $(DESTDIR)$(datadir)/aclocal/sdl.m4
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
143 $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)/pkgconfig
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
144 $(INSTALL) -m 644 sdl.pc $(DESTDIR)$(libdir)/pkgconfig
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
145
3352
6dc250ebdd80 The SDL 1.3 documentation will be primarily online wiki based:
Sam Lantinga <slouken@libsdl.org>
parents: 3344
diff changeset
146 uninstall: uninstall-bin uninstall-hdrs uninstall-lib uninstall-data
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
147 uninstall-bin:
2156
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
148 rm -f $(DESTDIR)$(bindir)/sdl-config
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
149 uninstall-hdrs:
2122
b15ffacb66d3 Don't install the extra SDL config headers or SDL_copying.h
Sam Lantinga <slouken@libsdl.org>
parents: 2083
diff changeset
150 for file in $(HDRS); do \
2156
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
151 rm -f $(DESTDIR)$(includedir)/SDL/$$file; \
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
152 done
2156
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
153 rm -f $(DESTDIR)$(includedir)/SDL/SDL_config.h
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
154 -rmdir $(DESTDIR)$(includedir)/SDL
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
155 uninstall-lib:
2156
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
156 $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(TARGET)
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
157 rm -f $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
158 uninstall-data:
2156
cd041eb7eb4a Fixed configure warning about datarootdir
Sam Lantinga <slouken@libsdl.org>
parents: 2151
diff changeset
159 rm -f $(DESTDIR)$(datadir)/aclocal/sdl.m4
3355
3c9e6f2f3c58 Merged r4974:4975 from branches/SDL-1.2: sdl.pc removal on make uninstall.
Ryan C. Gordon <icculus@icculus.org>
parents: 3352
diff changeset
160 rm -f $(DESTDIR)$(libdir)/pkgconfig/sdl.pc
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
161
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
162 clean:
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
163 rm -rf $(objects)
1380
d94b080ff6ce Completely removed dependency on automake
Sam Lantinga <slouken@libsdl.org>
parents: 1362
diff changeset
164 if test -f test/Makefile; then (cd test; $(MAKE) $@); fi
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
165
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
166 distclean: clean
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
167 rm -f Makefile include/SDL_config.h sdl-config
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
168 rm -f SDL.qpg
3334
61ea9005fddf Use gcc's built-in dependency generation, thanks to Adam Strzelecki
Sam Lantinga <slouken@libsdl.org>
parents: 3311
diff changeset
169 rm -f config.status config.cache config.log libtool
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
170 rm -rf $(srcdir)/autom4te*
1603
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents: 1580
diff changeset
171 find $(srcdir) \( \
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents: 1580
diff changeset
172 -name '*~' -o \
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents: 1580
diff changeset
173 -name '*.bak' -o \
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents: 1580
diff changeset
174 -name '*.old' -o \
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents: 1580
diff changeset
175 -name '*.rej' -o \
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents: 1580
diff changeset
176 -name '*.orig' -o \
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents: 1580
diff changeset
177 -name '.#*' \) \
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
178 -exec rm -f {} \;
1603
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents: 1580
diff changeset
179 cp $(srcdir)/include/SDL_config.h.default $(srcdir)/include/SDL_config.h
1380
d94b080ff6ce Completely removed dependency on automake
Sam Lantinga <slouken@libsdl.org>
parents: 1362
diff changeset
180 if test -f test/Makefile; then (cd test; $(MAKE) $@); fi
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
181
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
182 dist $(distfile):
1391
7dc446173e37 Blargle-fnargle dependencies and build rules
Sam Lantinga <slouken@libsdl.org>
parents: 1390
diff changeset
183 $(SHELL) $(auxdir)/mkinstalldirs $(distdir)
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
184 tar cf - $(DIST) | (cd $(distdir); tar xf -)
1603
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents: 1580
diff changeset
185 cp $(distdir)/include/SDL_config.h.default $(distdir)/include/SDL_config.h
2982
b64c1d23039b Make the current revision number available
Sam Lantinga <slouken@libsdl.org>
parents: 2713
diff changeset
186 $(SHELL) $(distdir)/build-scripts/updaterev.sh
1651
0a9be1057095 subversion conversion complete!
Sam Lantinga <slouken@libsdl.org>
parents: 1634
diff changeset
187 rm -rf `find $(distdir) -name .svn`
1846
699eaff87cbb Whoops, clean files in the dist directory
Sam Lantinga <slouken@libsdl.org>
parents: 1845
diff changeset
188 find $(distdir) \( \
1845
Sam Lantinga <slouken@libsdl.org>
parents: 1774
diff changeset
189 -name '*~' -o \
Sam Lantinga <slouken@libsdl.org>
parents: 1774
diff changeset
190 -name '*.bak' -o \
Sam Lantinga <slouken@libsdl.org>
parents: 1774
diff changeset
191 -name '*.old' -o \
Sam Lantinga <slouken@libsdl.org>
parents: 1774
diff changeset
192 -name '*.rej' -o \
Sam Lantinga <slouken@libsdl.org>
parents: 1774
diff changeset
193 -name '*.orig' -o \
Sam Lantinga <slouken@libsdl.org>
parents: 1774
diff changeset
194 -name '.#*' \) \
Sam Lantinga <slouken@libsdl.org>
parents: 1774
diff changeset
195 -exec rm -f {} \;
1848
3c5eed71a332 Clean out the tests before creating distribution archive
Sam Lantinga <slouken@libsdl.org>
parents: 1846
diff changeset
196 if test -f $(distdir)/test/Makefile; then (cd $(distdir)/test && make distclean); fi
1362
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
197 tar cvf - $(distdir) | gzip --best >$(distfile)
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
198 rm -rf $(distdir)
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
199
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
200 rpm: $(distfile)
88ddeb76c9c1 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
201 rpmbuild -ta $?
1424
7a610f25c12f Updated MacOS Classic MPW build
Sam Lantinga <slouken@libsdl.org>
parents: 1419
diff changeset
202
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
203 # Run indent on the source to standardize coding style
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
204 indent:
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
205 @echo "Running indent... modified files:"
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
206 @cd $(srcdir) && \
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
207 find . \( \
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
208 -name '*.h' -o \
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
209 -name '*.c' -o \
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
210 -name '*.cc' \) \
2220
4d2d0548f5b2 Don't run indent on the Xcode templates
Sam Lantinga <slouken@libsdl.org>
parents: 2207
diff changeset
211 -print | fgrep -v ./Xcode | \
1895
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
212 while read file; do \
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
213 indent "$$file" -o "$$file.indent"; \
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
214 if cmp "$$file" "$$file.indent" >/dev/null; then \
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
215 rm -f "$$file.indent"; \
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
216 else \
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
217 echo "$$file"; \
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
218 mv -f "$$file.indent" "$$file"; \
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
219 fi; \
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
220 done
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
221
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
222 # Run indent and then commit modified files
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
223 commit: indent
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
224 svn commit
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
Sam Lantinga <slouken@libsdl.org>
parents: 1894
diff changeset
225
1651
0a9be1057095 subversion conversion complete!
Sam Lantinga <slouken@libsdl.org>
parents: 1634
diff changeset
226 # Create a SVN snapshot that people can run update on
1424
7a610f25c12f Updated MacOS Classic MPW build
Sam Lantinga <slouken@libsdl.org>
parents: 1419
diff changeset
227 snapshot:
3027
61225d2834a3 Fixed snapshot target
Sam Lantinga <slouken@libsdl.org>
parents: 2984
diff changeset
228 $(SHELL) $(auxdir)/snapshot.sh