*** empty log message ***
authorSam Lantinga <slouken@lokigames.com>
Wed, 05 Jan 2000 19:17:38 +0000
changeset 32a22f14f67550
parent 31 3a4a52572b7e
child 33 f7004679e34d
*** empty log message ***
Makefile.am
Makefile.in
mikmod/Makefile.in
     1.1 --- a/Makefile.am	Tue Dec 28 18:52:11 1999 +0000
     1.2 +++ b/Makefile.am	Wed Jan 05 19:17:38 2000 +0000
     1.3 @@ -1,15 +1,15 @@
     1.4  # Makefile.am for the SDL sample mixer library and players
     1.5  
     1.6 -lib_LTLIBRARIES = libSDLmixer.la
     1.7 +lib_LTLIBRARIES = libmixer.la
     1.8  
     1.9  SUBDIRS = @MUSIC_SUBDIRS@
    1.10  DIST_SUBIDRS = mikmod timidity
    1.11  
    1.12 -libSDLmixerincludedir = $(includedir)
    1.13 -libSDLmixerinclude_HEADERS =	\
    1.14 +libmixerincludedir = $(includedir)
    1.15 +libmixerinclude_HEADERS =	\
    1.16  	mixer.h
    1.17  
    1.18 -libSDLmixer_la_SOURCES =	\
    1.19 +libmixer_la_SOURCES =	\
    1.20  	mixer.c			\
    1.21  	music.c			\
    1.22  	music_cmd.c		\
    1.23 @@ -29,12 +29,12 @@
    1.24  TIMIDITY_LIB =
    1.25  endif
    1.26  
    1.27 -libSDLmixer_la_LDFLAGS = 		\
    1.28 +libmixer_la_LDFLAGS = 		\
    1.29          -release $(LT_RELEASE)	\
    1.30  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
    1.31 -libSDLmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
    1.32 +libmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
    1.33  
    1.34  bin_PROGRAMS = playwave playmus
    1.35  
    1.36 -playwave_LDADD = libSDLmixer.la
    1.37 -playmus_LDADD = libSDLmixer.la
    1.38 +playwave_LDADD = libmixer.la
    1.39 +playmus_LDADD = libmixer.la
     2.1 --- a/Makefile.in	Tue Dec 28 18:52:11 1999 +0000
     2.2 +++ b/Makefile.in	Wed Jan 05 19:17:38 2000 +0000
     2.3 @@ -88,30 +88,30 @@
     2.4  SDL_LIBS = @SDL_LIBS@
     2.5  VERSION = @VERSION@
     2.6  
     2.7 -lib_LTLIBRARIES = libSDLmixer.la
     2.8 +lib_LTLIBRARIES = libmixer.la
     2.9  
    2.10  SUBDIRS = @MUSIC_SUBDIRS@
    2.11  DIST_SUBIDRS = mikmod timidity
    2.12  
    2.13 -libSDLmixerincludedir = $(includedir)
    2.14 -libSDLmixerinclude_HEADERS =  	mixer.h
    2.15 +libmixerincludedir = $(includedir)
    2.16 +libmixerinclude_HEADERS =  	mixer.h
    2.17  
    2.18  
    2.19 -libSDLmixer_la_SOURCES =  	mixer.c				music.c				music_cmd.c			music_cmd.h			wave.h				wavestream.c			wavestream.h
    2.20 +libmixer_la_SOURCES =  	mixer.c				music.c				music_cmd.c			music_cmd.h			wave.h				wavestream.c			wavestream.h
    2.21  
    2.22  @USE_MIKMOD_TRUE@MIKMOD_LIB = mikmod/libmikmod.la
    2.23  @USE_MIKMOD_FALSE@MIKMOD_LIB = 
    2.24  @USE_TIMIDITY_TRUE@TIMIDITY_LIB = timidity/libtimidity.la
    2.25  @USE_TIMIDITY_FALSE@TIMIDITY_LIB = 
    2.26  
    2.27 -libSDLmixer_la_LDFLAGS =          -release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
    2.28 +libmixer_la_LDFLAGS =          -release $(LT_RELEASE)		-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
    2.29  
    2.30 -libSDLmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
    2.31 +libmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
    2.32  
    2.33  bin_PROGRAMS = playwave playmus
    2.34  
    2.35 -playwave_LDADD = libSDLmixer.la
    2.36 -playmus_LDADD = libSDLmixer.la
    2.37 +playwave_LDADD = libmixer.la
    2.38 +playmus_LDADD = libmixer.la
    2.39  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    2.40  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
    2.41  CONFIG_CLEAN_FILES = 
    2.42 @@ -122,31 +122,31 @@
    2.43  CPPFLAGS = @CPPFLAGS@
    2.44  LDFLAGS = @LDFLAGS@
    2.45  LIBS = @LIBS@
    2.46 -@USE_TIMIDITY_FALSE@@USE_MIKMOD_FALSE@libSDLmixer_la_DEPENDENCIES = 
    2.47 -@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@libSDLmixer_la_DEPENDENCIES =  \
    2.48 +@USE_TIMIDITY_FALSE@@USE_MIKMOD_FALSE@libmixer_la_DEPENDENCIES = 
    2.49 +@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@libmixer_la_DEPENDENCIES =  \
    2.50  @USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la \
    2.51  @USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@timidity/libtimidity.la
    2.52 -@USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@libSDLmixer_la_DEPENDENCIES =  \
    2.53 +@USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@libmixer_la_DEPENDENCIES =  \
    2.54  @USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@timidity/libtimidity.la
    2.55 -@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libSDLmixer_la_DEPENDENCIES =  \
    2.56 +@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libmixer_la_DEPENDENCIES =  \
    2.57  @USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la
    2.58 -libSDLmixer_la_OBJECTS =  mixer.lo music.lo music_cmd.lo wavestream.lo
    2.59 +libmixer_la_OBJECTS =  mixer.lo music.lo music_cmd.lo wavestream.lo
    2.60  PROGRAMS =  $(bin_PROGRAMS)
    2.61  
    2.62  playwave_SOURCES = playwave.c
    2.63  playwave_OBJECTS =  playwave.o
    2.64 -playwave_DEPENDENCIES =  libSDLmixer.la
    2.65 +playwave_DEPENDENCIES =  libmixer.la
    2.66  playwave_LDFLAGS = 
    2.67  playmus_SOURCES = playmus.c
    2.68  playmus_OBJECTS =  playmus.o
    2.69 -playmus_DEPENDENCIES =  libSDLmixer.la
    2.70 +playmus_DEPENDENCIES =  libmixer.la
    2.71  playmus_LDFLAGS = 
    2.72  CFLAGS = @CFLAGS@
    2.73  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    2.74  LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    2.75  CCLD = $(CC)
    2.76  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
    2.77 -HEADERS =  $(libSDLmixerinclude_HEADERS)
    2.78 +HEADERS =  $(libmixerinclude_HEADERS)
    2.79  
    2.80  DIST_COMMON =  README COPYING Makefile.am Makefile.in acinclude.m4 \
    2.81  aclocal.m4 config.guess config.sub configure configure.in install-sh \
    2.82 @@ -159,8 +159,8 @@
    2.83  GZIP_ENV = --best
    2.84  DEP_FILES =  .deps/mixer.P .deps/music.P .deps/music_cmd.P \
    2.85  .deps/playmus.P .deps/playwave.P .deps/wavestream.P
    2.86 -SOURCES = $(libSDLmixer_la_SOURCES) playwave.c playmus.c
    2.87 -OBJECTS = $(libSDLmixer_la_OBJECTS) playwave.o playmus.o
    2.88 +SOURCES = $(libmixer_la_SOURCES) playwave.c playmus.c
    2.89 +OBJECTS = $(libmixer_la_OBJECTS) playwave.o playmus.o
    2.90  
    2.91  all: all-redirect
    2.92  .SUFFIXES:
    2.93 @@ -237,8 +237,8 @@
    2.94  
    2.95  maintainer-clean-libtool:
    2.96  
    2.97 -libSDLmixer.la: $(libSDLmixer_la_OBJECTS) $(libSDLmixer_la_DEPENDENCIES)
    2.98 -	$(LINK) -rpath $(libdir) $(libSDLmixer_la_LDFLAGS) $(libSDLmixer_la_OBJECTS) $(libSDLmixer_la_LIBADD) $(LIBS)
    2.99 +libmixer.la: $(libmixer_la_OBJECTS) $(libmixer_la_DEPENDENCIES)
   2.100 +	$(LINK) -rpath $(libdir) $(libmixer_la_LDFLAGS) $(libmixer_la_OBJECTS) $(libmixer_la_LIBADD) $(LIBS)
   2.101  
   2.102  mostlyclean-binPROGRAMS:
   2.103  
   2.104 @@ -273,19 +273,19 @@
   2.105  	@rm -f playmus
   2.106  	$(LINK) $(playmus_LDFLAGS) $(playmus_OBJECTS) $(playmus_LDADD) $(LIBS)
   2.107  
   2.108 -install-libSDLmixerincludeHEADERS: $(libSDLmixerinclude_HEADERS)
   2.109 +install-libmixerincludeHEADERS: $(libmixerinclude_HEADERS)
   2.110  	@$(NORMAL_INSTALL)
   2.111 -	$(mkinstalldirs) $(DESTDIR)$(libSDLmixerincludedir)
   2.112 -	@list='$(libSDLmixerinclude_HEADERS)'; for p in $$list; do \
   2.113 +	$(mkinstalldirs) $(DESTDIR)$(libmixerincludedir)
   2.114 +	@list='$(libmixerinclude_HEADERS)'; for p in $$list; do \
   2.115  	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
   2.116 -	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libSDLmixerincludedir)/$$p"; \
   2.117 -	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libSDLmixerincludedir)/$$p; \
   2.118 +	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libmixerincludedir)/$$p"; \
   2.119 +	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libmixerincludedir)/$$p; \
   2.120  	done
   2.121  
   2.122 -uninstall-libSDLmixerincludeHEADERS:
   2.123 +uninstall-libmixerincludeHEADERS:
   2.124  	@$(NORMAL_UNINSTALL)
   2.125 -	list='$(libSDLmixerinclude_HEADERS)'; for p in $$list; do \
   2.126 -	  rm -f $(DESTDIR)$(libSDLmixerincludedir)/$$p; \
   2.127 +	list='$(libmixerinclude_HEADERS)'; for p in $$list; do \
   2.128 +	  rm -f $(DESTDIR)$(libmixerincludedir)/$$p; \
   2.129  	done
   2.130  
   2.131  # This directory's subdirectories are mostly independent; you can cd
   2.132 @@ -483,14 +483,14 @@
   2.133  install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
   2.134  install-exec: install-exec-recursive
   2.135  
   2.136 -install-data-am: install-libSDLmixerincludeHEADERS
   2.137 +install-data-am: install-libmixerincludeHEADERS
   2.138  install-data: install-data-recursive
   2.139  
   2.140  install-am: all-am
   2.141  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
   2.142  install: install-recursive
   2.143  uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
   2.144 -		uninstall-libSDLmixerincludeHEADERS
   2.145 +		uninstall-libmixerincludeHEADERS
   2.146  uninstall: uninstall-recursive
   2.147  all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
   2.148  all-redirect: all-recursive
   2.149 @@ -499,7 +499,7 @@
   2.150  installdirs: installdirs-recursive
   2.151  installdirs-am:
   2.152  	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
   2.153 -		$(DESTDIR)$(libSDLmixerincludedir)
   2.154 +		$(DESTDIR)$(libmixerincludedir)
   2.155  
   2.156  
   2.157  mostlyclean-generic:
   2.158 @@ -549,8 +549,8 @@
   2.159  mostlyclean-libtool distclean-libtool clean-libtool \
   2.160  maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \
   2.161  clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
   2.162 -install-binPROGRAMS uninstall-libSDLmixerincludeHEADERS \
   2.163 -install-libSDLmixerincludeHEADERS install-data-recursive \
   2.164 +install-binPROGRAMS uninstall-libmixerincludeHEADERS \
   2.165 +install-libmixerincludeHEADERS install-data-recursive \
   2.166  uninstall-data-recursive install-exec-recursive \
   2.167  uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
   2.168  all-recursive check-recursive installcheck-recursive info-recursive \
     3.1 --- a/mikmod/Makefile.in	Tue Dec 28 18:52:11 1999 +0000
     3.2 +++ b/mikmod/Makefile.in	Wed Jan 05 19:17:38 2000 +0000
     3.3 @@ -1,4 +1,4 @@
     3.4 -# Makefile.in generated automatically by automake 1.4 from Makefile.am
     3.5 +# Makefile.in generated automatically by automake 1.4a from Makefile.am
     3.6  
     3.7  # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
     3.8  # This Makefile.in is free software; the Free Software Foundation
     3.9 @@ -46,9 +46,10 @@
    3.10  AUTOHEADER = @AUTOHEADER@
    3.11  
    3.12  INSTALL = @INSTALL@
    3.13 -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
    3.14 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
    3.15  INSTALL_DATA = @INSTALL_DATA@
    3.16  INSTALL_SCRIPT = @INSTALL_SCRIPT@
    3.17 +INSTALL_STRIP_FLAG =
    3.18  transform = @program_transform_name@
    3.19  
    3.20  NORMAL_INSTALL = :
    3.21 @@ -224,7 +225,7 @@
    3.22  	@for file in $(DISTFILES); do \
    3.23  	  d=$(srcdir); \
    3.24  	  if test -d $$d/$$file; then \
    3.25 -	    cp -pr $$/$$file $(distdir)/$$file; \
    3.26 +	    cp -pr $$d/$$file $(distdir)/$$file; \
    3.27  	  else \
    3.28  	    test -f $(distdir)/$$file \
    3.29  	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
    3.30 @@ -285,7 +286,7 @@
    3.31  all-am: Makefile $(LTLIBRARIES)
    3.32  all-redirect: all-am
    3.33  install-strip:
    3.34 -	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
    3.35 +	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
    3.36  installdirs:
    3.37  
    3.38