$FreeBSD$

--- Setup.pre.in.orig	Wed Jan 31 02:03:12 2001
+++ Setup.pre.in	Tue May  8 10:35:22 2001
@@ -6,11 +6,11 @@
 
 
 ##CFLAGS = $(OPT) $(EXTRA_CFLAGS) $(CFLAGS__$(CC)) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
-CFLAGS = $(EXTRA_CFLAGS) $(CFLAGS__$(CC)) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
+CFLAGS += $(EXTRA_CFLAGS) $(CFLAGS__$(CC)) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
 
 ##CFLAGS__gcc = -Wall -O2 -finline-functions -ffast-math
-CFLAGS__gcc = -Wall -O2 -ffast-math
-EXTRA_CFLAGS = -I$(srcdir) -I$(srcdir)/mikmod $(SDL_CFLAGS) $(SMPEG_CFLAGS)
+CFLAGS__gcc = -Wall -ffast-math
+EXTRA_CFLAGS = $(SDL_CFLAGS) -I$(srcdir) $(SMPEG_CFLAGS)
 
 SMPEG_LIBS = @SMPEG_LIBS@
 SMPEG_CFLAGS = @SMPEG_CFLAGS@
@@ -20,32 +20,6 @@
 pysolsoundserver \
 	command.c \
 	module.c \
-	mixer/mixer.c \
-	mixer/music.c \
-	mixer/wavestream.c \
-	mikmod/drv_nos.c \
-	mikmod/drv_sdl.c \
-	mikmod/load_it.c \
-	mikmod/load_m15.c \
-	mikmod/load_mod.c \
-	mikmod/load_s3m.c \
-	mikmod/load_xm.c \
-	mikmod/mdreg.c \
-	mikmod/mdriver.c \
-	mikmod/mloader.c \
-	mikmod/mlreg.c \
-	mikmod/mlutil.c \
-	mikmod/mmalloc.c \
-	mikmod/mmerror.c \
-	mikmod/mmio.c \
-	mikmod/mplayer.c \
-	mikmod/munitrk.c \
-	mikmod/mwav.c \
-	mikmod/npertab.c \
-	mikmod/sloader.c \
-	mikmod/virtch.c \
-	mikmod/virtch2.c \
-	mikmod/virtch_common.c \
 # *** Uncomment and edit to reflect where your SDL library is:
-	@SDL_LIBS@ @SMPEG_LIBS@
+	@SDL_LIBS@ -lSDL_mixer @SMPEG_LIBS@