--- SIDPlayer/Makefile.BeOS	2000/09/19 13:28:05	1.1
+++ SIDPlayer/Makefile.BeOS	2001/05/26 12:09:56	1.7
@@ -4,8 +4,8 @@
 ## makefile-engine will do all of the hard work for you.  This handles both
 ## Intel and PowerPC builds of the BeOS.
 
-# Version number
-SP_VERSION = 4.0
+# Get version number from configure.in
+version := $(shell grep <configure.in INIT_AUTOMAKE | sed -e 's/.*\[//' -e 's/\].*//')
 
 ## Application Specific Settings ---------------------------------------------
 
@@ -33,12 +33,13 @@ TYPE=APP
 #	if two source files with the same name (source.c or source.cpp)
 #	are included from different directories.  Also note that spaces
 #	in folder names do not work well with this makefile.
-SRCS=src/main.cpp src/cl_amp.cpp src/prefs.cpp src/prefs_window.cpp src/mem.cpp \
+SRCS=src/main_beos.cpp src/main.cpp src/cl_amp.cpp src/soundplay.cpp \
+  src/prefs.cpp src/prefs_items.cpp src/prefs_window.cpp src/mem.cpp \
   src/cpu.cpp src/sid.cpp
 
 #	specify the resource files to use
 #	full path or a relative path to the resource file can be used.
-RSRCS= SIDPlayer.rsrc
+RSRCS=src/SIDPlayer.rsrc
 
 # @<-src@ 
 #%}
@@ -73,7 +74,7 @@ SYSTEM_INCLUDE_PATHS =
 #	additional paths to look for local headers
 #	thes use the form: #include "header"
 #	source file directories are automatically included
-LOCAL_INCLUDE_PATHS=src/clamp_includes
+LOCAL_INCLUDE_PATHS=src/clamp_includes src/soundplay_includes
 
 #	specify the level of optimization that you desire
 #	NONE, SOME, FULL
@@ -84,7 +85,7 @@ OPTIMIZE=FULL
 #	to use.  For example, setting DEFINES to "DEBUG=1" will cause the
 #	compiler option "-DDEBUG=1" to be used.  Setting DEFINES to "DEBUG"
 #	would pass "-DDEBUG" on the compiler's command line.
-DEFINES=SID_PLAYER
+DEFINES=SID_PLAYER VERSION=\"$(version)\"
 
 #	specify special warning levels
 #	if unspecified default warnings will be used
@@ -114,18 +115,17 @@ include /boot/develop/etc/makefile-engin
 # Create links to Frodo sources
 src/main.cpp: src/cpu_macros.h src/cpu_opcodes.h src/prefs.h src/sid.cpp
 src/cpu_macros.h src/cpu_opcodes.h src/prefs.h src/sid.cpp:
-	ln -s ../Frodo/src/$@ $@
+	ln -s ../../Frodo/$@ $@
 
 # Create binary distribution
-DISTDIR = SIDPlayer-$(SP_VERSION)
-ARCHIVE = SIDPlayer-$(SP_VERSION)-$(CPU).zip
+distdir = SIDPlayer-$(version)
 dist: $(TARGET)
-	-rm -rf $(DISTDIR)
-	mkdir $(DISTDIR)
-	cp COPYING README $(DISTDIR)
-	cp $(TARGET) $(DISTDIR)/SIDPlayer
-	cp -R "PSID Demo" $(DISTDIR)
-	rm -rf $(DISTDIR)/"PSID Demo/CVS"
-	mimeset -f $(DISTDIR)
-	zip -r $(ARCHIVE) $(DISTDIR)
-	rm -rf $(DISTDIR)
+	-rm -rf $(distdir)
+	mkdir $(distdir)
+	cp COPYING README $(distdir)
+	cp $(TARGET) $(distdir)/SIDPlayer
+	cp -R "PSID Demo" $(distdir)
+	rm -rf $(distdir)/"PSID Demo/CVS"
+	mimeset -f $(distdir)
+	zip -ry $(distdir)-$(CPU).zip $(distdir)
+	rm -rf $(distdir)