From 7ac59a18935c47c02007f45eb4ab118831950707 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 5 Jan 2000 19:17:38 +0000 Subject: [PATCH] *** empty log message *** --- Makefile.am | 16 +++++------ Makefile.in | 66 +++++++++++++++++++++++----------------------- mikmod/Makefile.in | 9 ++++--- 3 files changed, 46 insertions(+), 45 deletions(-) diff --git a/Makefile.am b/Makefile.am index db8db5d5..7374b413 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,15 +1,15 @@ # Makefile.am for the SDL sample mixer library and players -lib_LTLIBRARIES = libSDLmixer.la +lib_LTLIBRARIES = libmixer.la SUBDIRS = @MUSIC_SUBDIRS@ DIST_SUBIDRS = mikmod timidity -libSDLmixerincludedir = $(includedir) -libSDLmixerinclude_HEADERS = \ +libmixerincludedir = $(includedir) +libmixerinclude_HEADERS = \ mixer.h -libSDLmixer_la_SOURCES = \ +libmixer_la_SOURCES = \ mixer.c \ music.c \ music_cmd.c \ @@ -29,12 +29,12 @@ else TIMIDITY_LIB = endif -libSDLmixer_la_LDFLAGS = \ +libmixer_la_LDFLAGS = \ -release $(LT_RELEASE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -libSDLmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) +libmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) bin_PROGRAMS = playwave playmus -playwave_LDADD = libSDLmixer.la -playmus_LDADD = libSDLmixer.la +playwave_LDADD = libmixer.la +playmus_LDADD = libmixer.la diff --git a/Makefile.in b/Makefile.in index beda423e..476aacff 100644 --- a/Makefile.in +++ b/Makefile.in @@ -88,30 +88,30 @@ SDL_CONFIG = @SDL_CONFIG@ SDL_LIBS = @SDL_LIBS@ VERSION = @VERSION@ -lib_LTLIBRARIES = libSDLmixer.la +lib_LTLIBRARIES = libmixer.la SUBDIRS = @MUSIC_SUBDIRS@ DIST_SUBIDRS = mikmod timidity -libSDLmixerincludedir = $(includedir) -libSDLmixerinclude_HEADERS = mixer.h +libmixerincludedir = $(includedir) +libmixerinclude_HEADERS = mixer.h -libSDLmixer_la_SOURCES = mixer.c music.c music_cmd.c music_cmd.h wave.h wavestream.c wavestream.h +libmixer_la_SOURCES = mixer.c music.c music_cmd.c music_cmd.h wave.h wavestream.c wavestream.h @USE_MIKMOD_TRUE@MIKMOD_LIB = mikmod/libmikmod.la @USE_MIKMOD_FALSE@MIKMOD_LIB = @USE_TIMIDITY_TRUE@TIMIDITY_LIB = timidity/libtimidity.la @USE_TIMIDITY_FALSE@TIMIDITY_LIB = -libSDLmixer_la_LDFLAGS = -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +libmixer_la_LDFLAGS = -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -libSDLmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) +libmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB) bin_PROGRAMS = playwave playmus -playwave_LDADD = libSDLmixer.la -playmus_LDADD = libSDLmixer.la +playwave_LDADD = libmixer.la +playmus_LDADD = libmixer.la ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = @@ -122,31 +122,31 @@ DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -@USE_TIMIDITY_FALSE@@USE_MIKMOD_FALSE@libSDLmixer_la_DEPENDENCIES = -@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@libSDLmixer_la_DEPENDENCIES = \ +@USE_TIMIDITY_FALSE@@USE_MIKMOD_FALSE@libmixer_la_DEPENDENCIES = +@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@libmixer_la_DEPENDENCIES = \ @USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la \ @USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@timidity/libtimidity.la -@USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@libSDLmixer_la_DEPENDENCIES = \ +@USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@libmixer_la_DEPENDENCIES = \ @USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@timidity/libtimidity.la -@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libSDLmixer_la_DEPENDENCIES = \ +@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libmixer_la_DEPENDENCIES = \ @USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la -libSDLmixer_la_OBJECTS = mixer.lo music.lo music_cmd.lo wavestream.lo +libmixer_la_OBJECTS = mixer.lo music.lo music_cmd.lo wavestream.lo PROGRAMS = $(bin_PROGRAMS) playwave_SOURCES = playwave.c playwave_OBJECTS = playwave.o -playwave_DEPENDENCIES = libSDLmixer.la +playwave_DEPENDENCIES = libmixer.la playwave_LDFLAGS = playmus_SOURCES = playmus.c playmus_OBJECTS = playmus.o -playmus_DEPENDENCIES = libSDLmixer.la +playmus_DEPENDENCIES = libmixer.la playmus_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -HEADERS = $(libSDLmixerinclude_HEADERS) +HEADERS = $(libmixerinclude_HEADERS) DIST_COMMON = README COPYING Makefile.am Makefile.in acinclude.m4 \ aclocal.m4 config.guess config.sub configure configure.in install-sh \ @@ -159,8 +159,8 @@ TAR = gtar GZIP_ENV = --best DEP_FILES = .deps/mixer.P .deps/music.P .deps/music_cmd.P \ .deps/playmus.P .deps/playwave.P .deps/wavestream.P -SOURCES = $(libSDLmixer_la_SOURCES) playwave.c playmus.c -OBJECTS = $(libSDLmixer_la_OBJECTS) playwave.o playmus.o +SOURCES = $(libmixer_la_SOURCES) playwave.c playmus.c +OBJECTS = $(libmixer_la_OBJECTS) playwave.o playmus.o all: all-redirect .SUFFIXES: @@ -237,8 +237,8 @@ distclean-libtool: maintainer-clean-libtool: -libSDLmixer.la: $(libSDLmixer_la_OBJECTS) $(libSDLmixer_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libSDLmixer_la_LDFLAGS) $(libSDLmixer_la_OBJECTS) $(libSDLmixer_la_LIBADD) $(LIBS) +libmixer.la: $(libmixer_la_OBJECTS) $(libmixer_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libmixer_la_LDFLAGS) $(libmixer_la_OBJECTS) $(libmixer_la_LIBADD) $(LIBS) mostlyclean-binPROGRAMS: @@ -273,19 +273,19 @@ playmus: $(playmus_OBJECTS) $(playmus_DEPENDENCIES) @rm -f playmus $(LINK) $(playmus_LDFLAGS) $(playmus_OBJECTS) $(playmus_LDADD) $(LIBS) -install-libSDLmixerincludeHEADERS: $(libSDLmixerinclude_HEADERS) +install-libmixerincludeHEADERS: $(libmixerinclude_HEADERS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libSDLmixerincludedir) - @list='$(libSDLmixerinclude_HEADERS)'; for p in $$list; do \ + $(mkinstalldirs) $(DESTDIR)$(libmixerincludedir) + @list='$(libmixerinclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libSDLmixerincludedir)/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libSDLmixerincludedir)/$$p; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libmixerincludedir)/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libmixerincludedir)/$$p; \ done -uninstall-libSDLmixerincludeHEADERS: +uninstall-libmixerincludeHEADERS: @$(NORMAL_UNINSTALL) - list='$(libSDLmixerinclude_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(libSDLmixerincludedir)/$$p; \ + list='$(libmixerinclude_HEADERS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(libmixerincludedir)/$$p; \ done # This directory's subdirectories are mostly independent; you can cd @@ -483,14 +483,14 @@ installcheck: installcheck-recursive install-exec-am: install-libLTLIBRARIES install-binPROGRAMS install-exec: install-exec-recursive -install-data-am: install-libSDLmixerincludeHEADERS +install-data-am: install-libmixerincludeHEADERS install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \ - uninstall-libSDLmixerincludeHEADERS + uninstall-libmixerincludeHEADERS uninstall: uninstall-recursive all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-redirect: all-recursive @@ -499,7 +499,7 @@ install-strip: installdirs: installdirs-recursive installdirs-am: $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \ - $(DESTDIR)$(libSDLmixerincludedir) + $(DESTDIR)$(libmixerincludedir) mostlyclean-generic: @@ -549,8 +549,8 @@ distclean-compile clean-compile maintainer-clean-compile \ mostlyclean-libtool distclean-libtool clean-libtool \ maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \ clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ -install-binPROGRAMS uninstall-libSDLmixerincludeHEADERS \ -install-libSDLmixerincludeHEADERS install-data-recursive \ +install-binPROGRAMS uninstall-libmixerincludeHEADERS \ +install-libmixerincludeHEADERS install-data-recursive \ uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ all-recursive check-recursive installcheck-recursive info-recursive \ diff --git a/mikmod/Makefile.in b/mikmod/Makefile.in index bfd914bb..769e835f 100644 --- a/mikmod/Makefile.in +++ b/mikmod/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4a from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,9 +46,10 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -224,7 +225,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -285,7 +286,7 @@ uninstall: uninstall-am all-am: Makefile $(LTLIBRARIES) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install installdirs: