From 2ab22bdad1415813a3e1df329640332702272fc0 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 1 Sep 2008 17:01:58 +0000
Subject: - new configure/make layout:   - configure/main-makefile moved to
 root-dir   - configure-script checked in (no need to call autogen.sh on first
 run)   - autogen.sh, m4, install.sh etc. moved to dists/autogen/   -
 config.guess/sub for canonical builds - unit-tests moved to test - removed
 delphi subdir in portaudio/-mixer - COPYING.txt/AUTHORS.txt/... added -
 dists/delphi7/2005 added

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1334 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 369 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 369 insertions(+)
 create mode 100644 Makefile.in

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 00000000..487f01a5
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,369 @@
+#################################################
+# @PACKAGE_STRING@
+# @configure_input@
+#################################################
+
+@SET_MAKE@
+
+#################################################
+# Standard definitions
+#################################################
+
+prefix      ?= @prefix@
+exec_prefix ?= @exec_prefix@
+bindir      ?= @bindir@
+datarootdir ?= @datarootdir@
+# project root-dir (directory of configure script)
+top_srcdir  ?= @top_srcdir@
+# project src-dir (directory of the current Makefile)
+srcdir      ?= @srcdir@
+
+# file-type suffix of executables (e.g. ".exe" in windows)
+EXEEXT ?= @EXEEXT@
+
+#################################################
+# Tools
+#################################################
+
+# recursive dir creation tool (mkdir -p)
+MKDIR        ?= @MKDIR_P@
+RM           ?= rm -f
+RM_REC       ?= $(RM) -r
+
+# install tool
+INSTALL      ?= @INSTALL@
+INSTALL_DATA ?= @INSTALL_DATA@
+
+#################################################
+# General package configuration
+#################################################
+
+USDX_PACKAGE_NAME := @PACKAGE_NAME@
+USDX_VERSION := @PACKAGE_VERSION@
+USDX_TARNAME := @PACKAGE_TARNAME@
+
+#################################################
+# USDX Paths
+#################################################
+
+USDX_SRC_DIR   := $(top_srcdir)/src
+USDX_GAME_DIR  := $(top_srcdir)/game
+USDX_TOOLS_DIR := $(top_srcdir)/tools
+USDX_LIB_DIR   := $(USDX_SRC_DIR)/lib
+USDX_BUILD_DIR := $(USDX_SRC_DIR)/build
+
+AUTOGEN_DIR := $(top_srcdir)/dists/autogen
+
+# installation path
+INSTALL_datadir ?= $(datarootdir)/$(USDX_PACKAGE_NAME)
+
+#################################################
+# Binary name
+#################################################
+
+# name of executable
+USDX_BIN_NAME ?= ultrastardx$(EXEEXT)
+USDX_BIN := $(USDX_GAME_DIR)/$(USDX_BIN_NAME)
+
+#################################################
+# ProjectM
+#################################################
+
+PROJECTM_CWRAPPER_DIR := $(USDX_LIB_DIR)/projectM/cwrapper
+USE_PROJECTM_CWRAPPER = @USE_PROJECTM_CWRAPPER@
+
+#################################################
+# Dependencies
+#################################################
+
+DEPS := $(USDX_TOOLS_DIR)/ResourceExtractor
+ifeq ($(USE_PROJECTM_CWRAPPER), yes)
+DEPS += $(PROJECTM_CWRAPPER_DIR)
+endif
+
+#################################################
+# general targets
+#################################################
+
+BUILD_TARGETS = all debug release rebuild build
+.PHONY: $(BUILD_TARGETS)
+$(BUILD_TARGETS): all-deps
+	$(MAKE) -C src $@
+
+.PHONY: all-deps
+all-deps:
+	@for dir in $(DEPS); do \
+	  $(MAKE) -C "$$dir" all; \
+	done
+
+.PHONY: clean
+clean: clean-src clean-deps
+
+.PHONY: clean-src
+clean-src:
+	$(MAKE) -C src clean
+
+.PHONY: clean-deps
+clean-deps:
+	@for dir in $(DEPS); do \
+	  $(MAKE) -C "$$dir" clean; \
+	done
+
+.PHONY: mostlyclean
+mostlyclean: clean-src
+
+.PHONY: distclean
+distclean: clean
+	$(RM_REC) config.log config.status aclocal.m4 autom4te.cache
+	$(RM) Makefile $(USDX_SRC_DIR)/Makefile $(PROJECTM_CWRAPPER_DIR)/Makefile
+	$(RM) $(USDX_SRC_DIR)/config.inc 
+
+# remove temporary and backup files
+.PHONY: tidy
+tidy:
+# FPC stuff
+	find . -name "*.compiled" | xargs $(RM)
+# Delphi stuff
+	find . -name "__history" | xargs $(RM_REC)
+	find . -name "*.identcache" -o -name "*.dcu" | xargs $(RM)
+# Backup files
+	find . -name "*~" -o -name "*.bak" -o -name "*.orig" | xargs $(RM)
+
+#################################################
+# auto-update
+#################################################
+
+Makefile: Makefile.in $(USDX_SRC_DIR)/Makefile.in $(USDX_SRC_DIR)/config.inc.in $(PROJECTM_CWRAPPER_DIR)/Makefile.in config.status
+	@echo "-----------------------------------"
+	@echo "Performing reconfiguration..."
+	./config.status
+	@echo "-----------------------------------"
+
+config.status: configure
+	./config.status --recheck
+
+.PHONE: reconf
+reconf:
+	$(AUTOGEN_DIR)/autogen.sh
+
+#################################################
+# install/uninstall
+#################################################
+
+.PHONY: install
+install: all
+	$(MAKE) install-@install_type@
+
+.PHONY: uninstall
+uninstall: uninstall-@install_type@
+
+
+# local build
+
+.PHONY: install-local
+install-local:
+	@echo "Local build does not need to be installed."
+	@echo "Start with: $(USDX_BIN)"
+
+.PHONY: uninstall-local
+uninstall-local:
+	$(RM) "$(USDX_BIN)"
+
+
+# global build
+
+.PHONY: install-global
+install-global: install-data install-exec
+	@echo "--------------------------------"
+	@echo "$(USDX_PACKAGE_NAME) installed."
+	@echo "Start with: $(bindir)/$(USDX_BIN_NAME)"
+	@echo "--------------------------------"
+
+.PHONY: install-data
+install-data:
+	$(MAKE) RECURSIVE_SRC_DIR="artwork" RECURSIVE_DST_DIR="$(INSTALL_datadir)/artwork" install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/languages" RECURSIVE_DST_DIR="$(INSTALL_datadir)/languages" install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/sounds" RECURSIVE_DST_DIR="$(INSTALL_datadir)/sounds" install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/themes" RECURSIVE_DST_DIR="$(INSTALL_datadir)/themes" install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/resources" RECURSIVE_DST_DIR="$(INSTALL_datadir)/resources" install-data-recursive
+	$(INSTALL_DATA) "COPYING.txt" "$(INSTALL_datadir)"
+
+.PHONY: install-data-recursive
+install-data-recursive:
+	$(MKDIR) "$(RECURSIVE_DST_DIR)"
+	@for file in "$(RECURSIVE_SRC_DIR)"/*; do \
+	  if test -f "$$file"; then \
+	    echo $(INSTALL_DATA) "$$file" "$(RECURSIVE_DST_DIR)"; \
+	    $(INSTALL_DATA) "$$file" "$(RECURSIVE_DST_DIR)"; \
+	  fi; \
+	  if test -d "$$file"; then \
+	    subdir="$$file"; \
+	    subdirname=`basename "$$subdir"`; \
+	    $(MAKE) RECURSIVE_SRC_DIR="$$subdir" RECURSIVE_DST_DIR="$(RECURSIVE_DST_DIR)/$$subdirname" install-data-recursive; \
+	  fi; \
+	done
+
+.PHONY: install-exec
+install-exec:
+	$(MKDIR) "$(bindir)"
+	$(INSTALL) "$(USDX_BIN)" "$(bindir)"
+
+.PHONY: uninstall-global
+uninstall-global: uninstall-data uninstall-exec
+
+.PHONY: uninstall-data
+uninstall-data:
+	$(RM_REC) "$(INSTALL_datadir)/artwork"
+	$(RM_REC) "$(INSTALL_datadir)/languages"
+	$(RM_REC) "$(INSTALL_datadir)/sounds"
+	$(RM_REC) "$(INSTALL_datadir)/themes"
+	$(RM_REC) "$(INSTALL_datadir)/resources"
+	$(RM)     "$(INSTALL_datadir)/COPYING.txt"
+	-rmdir "$(INSTALL_datadir)"
+
+.PHONY: uninstall-exec
+uninstall-exec:
+	$(RM) "$(bindir)/$(USDX_BIN_NAME)"
+
+#################################################
+# Distributable source-package (TODO)
+#################################################
+
+disttmpdir ?= disttmp
+
+.PHONY: dist
+dist:
+#	$(MKDIR) $(disttmpdir)
+#	cp -R . $(disttmpdir)
+#	$(MAKE) -C $(disttmpdir)/src distclean 
+#	tar cvzf $(USDX_TARNAME)-$(USDX_VERSION).tar.gz $(disttmpdir)
+#	$(RM_REC) $(disttmpdir)
+
+#################################################
+# Debian package
+#################################################
+
+debpkgdir    ?= dists/debian
+debpkgtmpdir := $(debpkgdir)/deb-package
+debpkgprefix := $(USDX_PACKAGE_NAME)
+debpkgname   := $(debpkgprefix)_$(USDX_VERSION)_$(PPROCESSOR).deb
+
+.PHONY: debian-pkg
+debian-pkg: all
+	$(RM_REC) $(debpkgtmpdir)
+
+	$(MKDIR) $(debpkgdir)
+	$(MKDIR) $(debpkgtmpdir)/DEBIAN
+
+	$(MAKE) prefix=$(debpkgtmpdir)/$(prefix) install
+
+	$(INSTALL_DATA) $(debpkgdir)/$(debpkgprefix).control $(debpkgtmpdir)/DEBIAN/control
+
+	dpkg-deb --build $(debpkgtmpdir)
+	mv $(debpkgtmpdir)/../deb-package.deb $(debpkgdir)/$(debpkgname)
+
+	$(RM_REC) $(debpkgtmpdir)
+
+#################################################
+# RPM (TODO)
+#################################################
+
+.PHONY: rpm
+rpm: all
+	@echo "Coming soon"
+
+
+#################################################
+# Mac OS X defines
+#################################################
+
+# otool: Mac OS X object file displaying tool
+OTOOL := /usr/bin/otool 
+# install_name_tool: Mac OS X tool to change dynamic shared library install names
+INSTALL_NAME_TOOL := /usr/bin/install_name_tool
+# hdiutil: Mac OS X disk image tool
+HDIUTIL := /usr/bin/hdiutil
+
+#################################################
+# Mac OS X app-bundle
+#################################################
+
+macosx_bundle_path := UltraStarDeluxe.app/Contents
+.PHONY: macosx-app
+macosx-app: all 
+# Create double clickable Mac OS X application.
+
+	@echo ""
+	@echo "Creating the Mac OS X application"
+	@echo ""
+
+	$(MKDIR) $(macosx_bundle_path)/Resources
+
+# Put the icon file into its particular place. 
+# Must be done BEFORE info.plist is created.
+	$(INSTALL_DATA) icons/ultrastardx.icns $(macosx_bundle_path)/Resources/
+
+# the info.plist file
+	$(INSTALL_DATA) $(USDX_SRC_DIR)/macosx/Info.plist $(macosx_bundle_path)/
+
+# Copy the resources. 
+	$(MAKE) install-global INSTALL_datadir=$(macosx_bundle_path)/Resources bindir=$(macosx_bundle_path)/MacOS
+
+# final messages
+	@echo ""
+	@echo "Mac OS X application created."
+	@echo "Please report issues to the developer team, preferably mischi."
+	@echo "Have fun."
+	@echo ""
+
+.PHONY: macosx-standalone-app
+macosx-standalone-app: macosx-app 
+# Create double clickable standalone (does not need fink) Mac OS X 
+# application. Not fully test, but should work on 10.5.
+
+	@echo ""
+	@echo "Creating the standalone Mac OS X application"
+	@echo ""
+
+# copy the dylib and change its install names
+
+define install_osx_libraries
+    $(shell $(INSTALL) -m 755 $(dylib) $(macosx_bundle_path)/MacOS)
+    $(shell $(INSTALL_NAME_TOOL) -change $(dylib) @executable_path/$(notdir $(dylib)) $(macosx_bundle_path)/MacOS/ultrastardx)
+    $(shell $(INSTALL_NAME_TOOL) -id @executable_path/$(notdir $(dylib)) $(macosx_bundle_path)/MacOS/$(notdir $(dylib)))
+    $(foreach linked_dylibs_2,$(shell $(OTOOL) -L $(dylib) | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \usr\/lib | grep -v executable_path),$(rename_secondary_osx_libraries))
+endef
+
+define rename_secondary_osx_libraries
+    $(shell $(INSTALL_NAME_TOOL) -change $(linked_dylibs_2) @executable_path/$(notdir $(linked_dylibs_2)) $(macosx_bundle_path)/MacOS/$(notdir $(dylib)))
+endef
+
+# work on the dylibs in $(macosx_bundle_path)/MacOS/ultrastardx
+	$(foreach dylib,$(shell $(OTOOL) -L $(macosx_bundle_path)/MacOS/ultrastardx | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+
+# work on the secondary dylibs from ffmpeg
+# libavcodec references all tertiary libraries of the ffmpeg libs
+	$(foreach dylib,$(shell $(OTOOL) -L /sw/lib/libavcodec.dylib   | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+# same procedure in libfaac. it gets libgnugetopt
+	$(foreach dylib,$(shell $(OTOOL) -L /sw/lib/libfaac.dylib      | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+
+# same procedure for tertiary libs in SDL_image
+	$(foreach dylib,$(shell $(OTOOL) -L /sw/lib/libSDL_image.dylib | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+
+# X11 libs as well, because users may not have installed it on 10.4
+	$(foreach dylib,$(shell $(OTOOL) -L /usr/X11R6/lib/libX11.dylib  | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+
+# final messages
+	@echo "Standalone Mac OS X application created."
+	@echo ""
+
+.PHONY: macosx-disk-image
+macosx-disk-image: macosx-standalone-app
+	$(RM) ultrastardx.dmg
+	$(HDIUTIL) create -type SPARSE -size 30m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage
+	/bin/cp -R ../UltraStarDeluxe.app /Volumes/UltraStarDeluxe
+#	/bin/cp ultrastardx/icons/UltraStarDeluxeVolumeIcon.icns /Volumes/UltraStarDeluxe/.VolumeIcon.icns
+#	/Developer/Tools/SetFile -a C /Volumes/UltraStarDeluxe/.VolumeIcon.icns /Volumes/UltraStarDeluxe
+	$(HDIUTIL) detach /Volumes/UltraStarDeluxe
+	$(HDIUTIL) convert UltraStarDeluxe.sparseimage -format UDBZ -o ultrastardx.dmg
+	$(RM) UltraStarDeluxe.sparseimage
-- 
cgit v1.2.3


From 4859734e7e6699e5c88added2df53ba3ff168300 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 2 Sep 2008 13:34:19 +0000
Subject: - removed configure options --enable-local/global - instead for   -
 global build: just type "make" and "make install"   - local build: just type
 "make" and start "game/ultrastardx"

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1338 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 89 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 44 insertions(+), 45 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 487f01a5..324b0c92 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,6 +13,10 @@ prefix      ?= @prefix@
 exec_prefix ?= @exec_prefix@
 bindir      ?= @bindir@
 datarootdir ?= @datarootdir@
+libdir      ?= @libdir@
+docdir      ?= @docdir@
+pdfdir      ?= @pdfdir@
+mandir      ?= @mandir@
 # project root-dir (directory of configure script)
 top_srcdir  ?= @top_srcdir@
 # project src-dir (directory of the current Makefile)
@@ -34,6 +38,9 @@ RM_REC       ?= $(RM) -r
 INSTALL      ?= @INSTALL@
 INSTALL_DATA ?= @INSTALL_DATA@
 
+# installation path
+INSTALL_DATADIR ?= @INSTALL_DATADIR@
+
 #################################################
 # General package configuration
 #################################################
@@ -54,9 +61,6 @@ USDX_BUILD_DIR := $(USDX_SRC_DIR)/build
 
 AUTOGEN_DIR := $(top_srcdir)/dists/autogen
 
-# installation path
-INSTALL_datadir ?= $(datarootdir)/$(USDX_PACKAGE_NAME)
-
 #################################################
 # Binary name
 #################################################
@@ -109,14 +113,24 @@ clean-deps:
 	  $(MAKE) -C "$$dir" clean; \
 	done
 
+.PHONY: clean-game
+clean-game:
+	$(RM) $(USDX_GAME_DIR)/*.log
+	$(RM) $(USDX_GAME_DIR)/*.db
+	$(RM) $(USDX_GAME_DIR)/*.ini
+	-rmdir $(USDX_GAME_DIR)/screenshots
+	-rmdir $(USDX_GAME_DIR)/plugins
+	-rmdir $(USDX_GAME_DIR)/playlists
+	-rmdir $(USDX_GAME_DIR)/songs
+
 .PHONY: mostlyclean
 mostlyclean: clean-src
 
 .PHONY: distclean
-distclean: clean
+distclean: clean clean-game tidy
 	$(RM_REC) config.log config.status aclocal.m4 autom4te.cache
-	$(RM) Makefile $(USDX_SRC_DIR)/Makefile $(PROJECTM_CWRAPPER_DIR)/Makefile
 	$(RM) $(USDX_SRC_DIR)/config.inc 
+	$(RM) Makefile $(USDX_SRC_DIR)/Makefile $(PROJECTM_CWRAPPER_DIR)/Makefile
 
 # remove temporary and backup files
 .PHONY: tidy
@@ -152,41 +166,23 @@ reconf:
 
 .PHONY: install
 install: all
-	$(MAKE) install-@install_type@
-
-.PHONY: uninstall
-uninstall: uninstall-@install_type@
-
-
-# local build
-
-.PHONY: install-local
-install-local:
-	@echo "Local build does not need to be installed."
-	@echo "Start with: $(USDX_BIN)"
-
-.PHONY: uninstall-local
-uninstall-local:
-	$(RM) "$(USDX_BIN)"
-
-
-# global build
-
-.PHONY: install-global
-install-global: install-data install-exec
+	$(MAKE) install-all
 	@echo "--------------------------------"
 	@echo "$(USDX_PACKAGE_NAME) installed."
 	@echo "Start with: $(bindir)/$(USDX_BIN_NAME)"
 	@echo "--------------------------------"
 
+.PHONY: install-all
+install-all: install-data install-exec
+
 .PHONY: install-data
 install-data:
-	$(MAKE) RECURSIVE_SRC_DIR="artwork" RECURSIVE_DST_DIR="$(INSTALL_datadir)/artwork" install-data-recursive
-	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/languages" RECURSIVE_DST_DIR="$(INSTALL_datadir)/languages" install-data-recursive
-	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/sounds" RECURSIVE_DST_DIR="$(INSTALL_datadir)/sounds" install-data-recursive
-	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/themes" RECURSIVE_DST_DIR="$(INSTALL_datadir)/themes" install-data-recursive
-	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/resources" RECURSIVE_DST_DIR="$(INSTALL_datadir)/resources" install-data-recursive
-	$(INSTALL_DATA) "COPYING.txt" "$(INSTALL_datadir)"
+	$(MAKE) RECURSIVE_SRC_DIR="artwork" RECURSIVE_DST_DIR="$(INSTALL_DATADIR)/artwork" install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/languages" RECURSIVE_DST_DIR="$(INSTALL_DATADIR)/languages" install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/sounds" RECURSIVE_DST_DIR="$(INSTALL_DATADIR)/sounds" install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/themes" RECURSIVE_DST_DIR="$(INSTALL_DATADIR)/themes" install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/resources" RECURSIVE_DST_DIR="$(INSTALL_DATADIR)/resources" install-data-recursive
+	$(INSTALL_DATA) "COPYING.txt" "$(INSTALL_DATADIR)"
 
 .PHONY: install-data-recursive
 install-data-recursive:
@@ -208,18 +204,21 @@ install-exec:
 	$(MKDIR) "$(bindir)"
 	$(INSTALL) "$(USDX_BIN)" "$(bindir)"
 
-.PHONY: uninstall-global
-uninstall-global: uninstall-data uninstall-exec
+.PHONY: uninstall
+uninstall: uninstall-all
+
+.PHONY: uninstall-all
+uninstall-all: uninstall-data uninstall-exec
 
 .PHONY: uninstall-data
 uninstall-data:
-	$(RM_REC) "$(INSTALL_datadir)/artwork"
-	$(RM_REC) "$(INSTALL_datadir)/languages"
-	$(RM_REC) "$(INSTALL_datadir)/sounds"
-	$(RM_REC) "$(INSTALL_datadir)/themes"
-	$(RM_REC) "$(INSTALL_datadir)/resources"
-	$(RM)     "$(INSTALL_datadir)/COPYING.txt"
-	-rmdir "$(INSTALL_datadir)"
+	$(RM_REC) "$(INSTALL_DATADIR)/artwork"
+	$(RM_REC) "$(INSTALL_DATADIR)/languages"
+	$(RM_REC) "$(INSTALL_DATADIR)/sounds"
+	$(RM_REC) "$(INSTALL_DATADIR)/themes"
+	$(RM_REC) "$(INSTALL_DATADIR)/resources"
+	$(RM)     "$(INSTALL_DATADIR)/COPYING.txt"
+	-rmdir "$(INSTALL_DATADIR)"
 
 .PHONY: uninstall-exec
 uninstall-exec:
@@ -248,8 +247,8 @@ debpkgtmpdir := $(debpkgdir)/deb-package
 debpkgprefix := $(USDX_PACKAGE_NAME)
 debpkgname   := $(debpkgprefix)_$(USDX_VERSION)_$(PPROCESSOR).deb
 
-.PHONY: debian-pkg
-debian-pkg: all
+.PHONY: deb
+deb: all
 	$(RM_REC) $(debpkgtmpdir)
 
 	$(MKDIR) $(debpkgdir)
@@ -307,7 +306,7 @@ macosx-app: all
 	$(INSTALL_DATA) $(USDX_SRC_DIR)/macosx/Info.plist $(macosx_bundle_path)/
 
 # Copy the resources. 
-	$(MAKE) install-global INSTALL_datadir=$(macosx_bundle_path)/Resources bindir=$(macosx_bundle_path)/MacOS
+	$(MAKE) install-all INSTALL_DATADIR=$(macosx_bundle_path)/Resources bindir=$(macosx_bundle_path)/MacOS
 
 # final messages
 	@echo ""
-- 
cgit v1.2.3


From 45d192b85eec3370e0bd5cfe2588fac8cec28cff Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 3 Sep 2008 23:59:46 +0000
Subject: songs folder created in Application
 Support/UltraStarDeluxe/Resources. creation of disk image fixed

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1342 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 324b0c92..aec4be35 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -308,6 +308,9 @@ macosx-app: all
 # Copy the resources. 
 	$(MAKE) install-all INSTALL_DATADIR=$(macosx_bundle_path)/Resources bindir=$(macosx_bundle_path)/MacOS
 
+# Create the song directory. 
+	$(MKDIR) $(macosx_bundle_path)/Resources/songs
+
 # final messages
 	@echo ""
 	@echo "Mac OS X application created."
@@ -360,7 +363,7 @@ endef
 macosx-disk-image: macosx-standalone-app
 	$(RM) ultrastardx.dmg
 	$(HDIUTIL) create -type SPARSE -size 30m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage
-	/bin/cp -R ../UltraStarDeluxe.app /Volumes/UltraStarDeluxe
+	/bin/cp -R UltraStarDeluxe.app /Volumes/UltraStarDeluxe
 #	/bin/cp ultrastardx/icons/UltraStarDeluxeVolumeIcon.icns /Volumes/UltraStarDeluxe/.VolumeIcon.icns
 #	/Developer/Tools/SetFile -a C /Volumes/UltraStarDeluxe/.VolumeIcon.icns /Volumes/UltraStarDeluxe
 	$(HDIUTIL) detach /Volumes/UltraStarDeluxe
-- 
cgit v1.2.3


From 0d59e17338bb4707a94de773e6f44f9a426fdca0 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 4 Sep 2008 22:38:44 +0000
Subject: make macosx-disk-image renamed to make macosx-dmg; new: make
 macosx-clean removes bundle AND diskimage

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1344 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index aec4be35..f48fba24 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -132,6 +132,18 @@ distclean: clean clean-game tidy
 	$(RM) $(USDX_SRC_DIR)/config.inc 
 	$(RM) Makefile $(USDX_SRC_DIR)/Makefile $(PROJECTM_CWRAPPER_DIR)/Makefile
 
+# remove Mac OS X apllication bundle and disk image
+.PHONY: clean-macosx
+clean-macosx: clean-macosx-app clean-macosx-dmg
+
+.PHONY: clean-macosx-app
+clean-macosx-app:
+	$(RM) -r UltraStarDeluxe.app 
+
+.PHONY: clean-macosx-dmg
+clean-macosx-dmg:
+	$(RM) UltraStarDeluxe.dmg 
+
 # remove temporary and backup files
 .PHONY: tidy
 tidy:
@@ -359,13 +371,13 @@ endef
 	@echo "Standalone Mac OS X application created."
 	@echo ""
 
-.PHONY: macosx-disk-image
-macosx-disk-image: macosx-standalone-app
-	$(RM) ultrastardx.dmg
+.PHONY: macosx-dmg
+macosx-dmg: macosx-standalone-app
+	$(RM) UltraStarDeluxe.dmg
 	$(HDIUTIL) create -type SPARSE -size 30m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage
 	/bin/cp -R UltraStarDeluxe.app /Volumes/UltraStarDeluxe
 #	/bin/cp ultrastardx/icons/UltraStarDeluxeVolumeIcon.icns /Volumes/UltraStarDeluxe/.VolumeIcon.icns
 #	/Developer/Tools/SetFile -a C /Volumes/UltraStarDeluxe/.VolumeIcon.icns /Volumes/UltraStarDeluxe
 	$(HDIUTIL) detach /Volumes/UltraStarDeluxe
-	$(HDIUTIL) convert UltraStarDeluxe.sparseimage -format UDBZ -o ultrastardx.dmg
+	$(HDIUTIL) convert UltraStarDeluxe.sparseimage -format UDBZ -o UltraStarDeluxe.dmg
 	$(RM) UltraStarDeluxe.sparseimage
-- 
cgit v1.2.3


From 5e1dd23ad5ed2fe8b0a618a9f9e10eac1694fe2b Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 9 Sep 2008 12:50:50 +0000
Subject: - better conformance of Makefiles to GNU coding standards   -
 bindir/prefix, etc. can be changed anytime make is performed and is not
 hardcoded on configure time anymore   - paths are written to the intermediate
 paths.inc file (instead of config-xyz.inc)   - binary is not stripped anymore
 - fpc.m4 rewrite   - additional options like heaptrace, range-checks   -
 noexecstack workaround   - some more changes - configure.ac helper functions
 moved to ax_ectract_version.m4 and pkg_config_utils.m4 - some icons moved
 from artwork to icons

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1351 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 186 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 126 insertions(+), 60 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index f48fba24..334a5bc7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,6 +4,7 @@
 #################################################
 
 @SET_MAKE@
+SHELL = /bin/sh
 
 #################################################
 # Standard definitions
@@ -13,6 +14,7 @@ prefix      ?= @prefix@
 exec_prefix ?= @exec_prefix@
 bindir      ?= @bindir@
 datarootdir ?= @datarootdir@
+datadir     ?= @datadir@
 libdir      ?= @libdir@
 docdir      ?= @docdir@
 pdfdir      ?= @pdfdir@
@@ -35,11 +37,9 @@ RM           ?= rm -f
 RM_REC       ?= $(RM) -r
 
 # install tool
-INSTALL      ?= @INSTALL@
-INSTALL_DATA ?= @INSTALL_DATA@
-
-# installation path
-INSTALL_DATADIR ?= @INSTALL_DATADIR@
+INSTALL         ?= @INSTALL@
+INSTALL_DATA    ?= @INSTALL_DATA@
+INSTALL_PROGRAM ?= @INSTALL_DATA@
 
 #################################################
 # General package configuration
@@ -56,10 +56,12 @@ USDX_TARNAME := @PACKAGE_TARNAME@
 USDX_SRC_DIR   := $(top_srcdir)/src
 USDX_GAME_DIR  := $(top_srcdir)/game
 USDX_TOOLS_DIR := $(top_srcdir)/tools
+USDX_BUILD_DIR := $(top_srcdir)/build
 USDX_LIB_DIR   := $(USDX_SRC_DIR)/lib
-USDX_BUILD_DIR := $(USDX_SRC_DIR)/build
 
-AUTOGEN_DIR := $(top_srcdir)/dists/autogen
+INSTALL_DATADIR := $(datadir)/$(USDX_PACKAGE_NAME)
+
+AUTOGEN_DIR := $(srcdir)/dists/autogen
 
 #################################################
 # Binary name
@@ -89,10 +91,30 @@ endif
 # general targets
 #################################################
 
+##
+# IMPORTANT:
+# Always assure that this Makefile still works with the -jN 
+# parameter set. This is important as Gentoo uses parallel 
+# make (-j2) by default.
+# If parallel execution is enabled you cannot rely on a 
+# specific order the prerequisites are build. 
+#
+# Example:
+#   target: dependency dependant
+#
+# will first build "dependency" and "dependant" afterwards with a
+# sequential execution (-j1). With parallel execution "dependant"
+# might be started before "dependency" is finished and make will
+# crash.
+#
+# If it is not possible, add the virtual .NOTPARALLEL target.
+# This will disable parallel execution for ALL targets.
+##
+
 BUILD_TARGETS = all debug release rebuild build
 .PHONY: $(BUILD_TARGETS)
 $(BUILD_TARGETS): all-deps
-	$(MAKE) -C src $@
+	$(MAKE) -C $(USDX_SRC_DIR) $@
 
 .PHONY: all-deps
 all-deps:
@@ -105,7 +127,7 @@ clean: clean-src clean-deps
 
 .PHONY: clean-src
 clean-src:
-	$(MAKE) -C src clean
+	$(MAKE) -C $(USDX_SRC_DIR) clean
 
 .PHONY: clean-deps
 clean-deps:
@@ -123,43 +145,37 @@ clean-game:
 	-rmdir $(USDX_GAME_DIR)/playlists
 	-rmdir $(USDX_GAME_DIR)/songs
 
+# just clean the game build data but no dependencies (libs, tools, ...)
 .PHONY: mostlyclean
 mostlyclean: clean-src
 
 .PHONY: distclean
-distclean: clean clean-game tidy
-	$(RM_REC) config.log config.status aclocal.m4 autom4te.cache
+distclean: clean clean-game
+	$(RM) config.log config.status aclocal.m4 
+	$(RM_REC) autom4te.cache
 	$(RM) $(USDX_SRC_DIR)/config.inc 
-	$(RM) Makefile $(USDX_SRC_DIR)/Makefile $(PROJECTM_CWRAPPER_DIR)/Makefile
-
-# remove Mac OS X apllication bundle and disk image
-.PHONY: clean-macosx
-clean-macosx: clean-macosx-app clean-macosx-dmg
-
-.PHONY: clean-macosx-app
-clean-macosx-app:
-	$(RM) -r UltraStarDeluxe.app 
+	$(RM) $(srcdir)/Makefile $(USDX_SRC_DIR)/Makefile $(PROJECTM_CWRAPPER_DIR)/Makefile
 
-.PHONY: clean-macosx-dmg
-clean-macosx-dmg:
-	$(RM) UltraStarDeluxe.dmg 
+.PHONY: maintainer-clean
+maintainer-clean: distclean
 
 # remove temporary and backup files
 .PHONY: tidy
 tidy:
 # FPC stuff
-	find . -name "*.compiled" | xargs $(RM)
+	find $(srcdir) -name "*.compiled" | xargs $(RM)
 # Delphi stuff
-	find . -name "__history" | xargs $(RM_REC)
-	find . -name "*.identcache" -o -name "*.dcu" | xargs $(RM)
+	find $(srcdir) -name "__history" | xargs $(RM_REC)
+	find $(srcdir) -name "*.identcache" -o -name "*.dcu" | xargs $(RM)
 # Backup files
-	find . -name "*~" -o -name "*.bak" -o -name "*.orig" | xargs $(RM)
+	find $(srcdir) -name "*~" -o -name "*.bak" -o -name "*.orig" | xargs $(RM)
+
 
 #################################################
 # auto-update
 #################################################
 
-Makefile: Makefile.in $(USDX_SRC_DIR)/Makefile.in $(USDX_SRC_DIR)/config.inc.in $(PROJECTM_CWRAPPER_DIR)/Makefile.in config.status
+Makefile: $(srcdir)/Makefile.in $(USDX_SRC_DIR)/Makefile.in $(USDX_SRC_DIR)/config.inc.in $(PROJECTM_CWRAPPER_DIR)/Makefile.in config.status
 	@echo "-----------------------------------"
 	@echo "Performing reconfiguration..."
 	./config.status
@@ -176,46 +192,74 @@ reconf:
 # install/uninstall
 #################################################
 
+##
+# For information on directory and install conventions see
+#   "info autoconf", Section 4.8.2. Installation Directory Variables
+#                    Section 4.8.1, 4.8.3 and 4.8.4 
+# Notes:
+# - "make install" must not rebuild, so do not depend on all.
+# - use the DESTDIR variable as prefix for installation directories, 
+#   otherwise Gentoo will not be able to install as it uses a sandbox.
+##
+
 .PHONY: install
-install: all
-	$(MAKE) install-all
+install: install-all
 	@echo "--------------------------------"
 	@echo "$(USDX_PACKAGE_NAME) installed."
 	@echo "Start with: $(bindir)/$(USDX_BIN_NAME)"
 	@echo "--------------------------------"
 
+# strip binaries during install
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \
+                install
+
 .PHONY: install-all
-install-all: install-data install-exec
+install-all: install-exec install-data
+
+.PHONY: install-exec
+install-exec:
+	$(MKDIR) "$(DESTDIR)$(bindir)"
+	$(INSTALL_PROGRAM) "$(USDX_BIN)" "$(DESTDIR)$(bindir)"
 
 .PHONY: install-data
 install-data:
-	$(MAKE) RECURSIVE_SRC_DIR="artwork" RECURSIVE_DST_DIR="$(INSTALL_DATADIR)/artwork" install-data-recursive
-	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/languages" RECURSIVE_DST_DIR="$(INSTALL_DATADIR)/languages" install-data-recursive
-	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/sounds" RECURSIVE_DST_DIR="$(INSTALL_DATADIR)/sounds" install-data-recursive
-	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/themes" RECURSIVE_DST_DIR="$(INSTALL_DATADIR)/themes" install-data-recursive
-	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/resources" RECURSIVE_DST_DIR="$(INSTALL_DATADIR)/resources" install-data-recursive
-	$(INSTALL_DATA) "COPYING.txt" "$(INSTALL_DATADIR)"
+	$(MAKE) RECURSIVE_SRC_DIR="artwork" \
+                RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/artwork" \
+                install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/languages" \
+                RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/languages" \
+                install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/sounds" \
+                RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/sounds" \
+                install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/themes" \
+                RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/themes" \
+                install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/resources" \
+                RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/resources" \
+                install-data-recursive
+	$(INSTALL_DATA) "COPYING.txt" "$(DESTDIR)$(INSTALL_DATADIR)/COPYING.txt"
 
 .PHONY: install-data-recursive
 install-data-recursive:
+# Note: the project contains filesnames with whitespace 
 	$(MKDIR) "$(RECURSIVE_DST_DIR)"
 	@for file in "$(RECURSIVE_SRC_DIR)"/*; do \
 	  if test -f "$$file"; then \
-	    echo $(INSTALL_DATA) "$$file" "$(RECURSIVE_DST_DIR)"; \
-	    $(INSTALL_DATA) "$$file" "$(RECURSIVE_DST_DIR)"; \
+	    filename=`basename "$$file"`; \
+	    echo "$(INSTALL_DATA) \"$$file\" \"$(RECURSIVE_DST_DIR)/$$filename\""; \
+	    $(INSTALL_DATA) "$$file" "$(RECURSIVE_DST_DIR)/$$filename" || exit 1; \
 	  fi; \
 	  if test -d "$$file"; then \
 	    subdir="$$file"; \
 	    subdirname=`basename "$$subdir"`; \
-	    $(MAKE) RECURSIVE_SRC_DIR="$$subdir" RECURSIVE_DST_DIR="$(RECURSIVE_DST_DIR)/$$subdirname" install-data-recursive; \
+	    $(MAKE) RECURSIVE_SRC_DIR="$$subdir" \
+	            RECURSIVE_DST_DIR="$(RECURSIVE_DST_DIR)/$$subdirname" \
+	            install-data-recursive || exit 1; \
 	  fi; \
 	done
 
-.PHONY: install-exec
-install-exec:
-	$(MKDIR) "$(bindir)"
-	$(INSTALL) "$(USDX_BIN)" "$(bindir)"
-
 .PHONY: uninstall
 uninstall: uninstall-all
 
@@ -224,31 +268,41 @@ uninstall-all: uninstall-data uninstall-exec
 
 .PHONY: uninstall-data
 uninstall-data:
-	$(RM_REC) "$(INSTALL_DATADIR)/artwork"
-	$(RM_REC) "$(INSTALL_DATADIR)/languages"
-	$(RM_REC) "$(INSTALL_DATADIR)/sounds"
-	$(RM_REC) "$(INSTALL_DATADIR)/themes"
-	$(RM_REC) "$(INSTALL_DATADIR)/resources"
-	$(RM)     "$(INSTALL_DATADIR)/COPYING.txt"
-	-rmdir "$(INSTALL_DATADIR)"
+	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/artwork"
+	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/languages"
+	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/sounds"
+	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/themes"
+	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/resources"
+	$(RM)     "$(DESTDIR)$(INSTALL_DATADIR)/COPYING.txt"
+	-rmdir "$(DESTDIR)$(INSTALL_DATADIR)"
 
 .PHONY: uninstall-exec
 uninstall-exec:
-	$(RM) "$(bindir)/$(USDX_BIN_NAME)"
+	$(RM) "$(DESTDIR)$(bindir)/$(USDX_BIN_NAME)"
 
 #################################################
 # Distributable source-package (TODO)
 #################################################
 
-disttmpdir ?= disttmp
+#disttmpdir := $(USDX_PACKAGE_NAME)-$(USDX_VERSION)-src
+disttmpdir := $(USDX_PACKAGE_NAME)-1.1_alpha-src
+# choose all files in SVN that are not deleted
+svn-files := svn status -v | grep -v "^[?D]" | cut -c8- | tr -s " " | cut -f5- -d" "
 
 .PHONY: dist
 dist:
-#	$(MKDIR) $(disttmpdir)
-#	cp -R . $(disttmpdir)
-#	$(MAKE) -C $(disttmpdir)/src distclean 
-#	tar cvzf $(USDX_TARNAME)-$(USDX_VERSION).tar.gz $(disttmpdir)
-#	$(RM_REC) $(disttmpdir)
+	@$(svn-files) | while read FILE; do \
+	  if test -d "$$FILE"; then \
+	    echo "MKDIR: $(disttmpdir)/$$FILE"; \
+	    $(MKDIR) "$(disttmpdir)/$$FILE" || exit 1; \
+	  else \
+	    echo "COPY:  $$FILE"; \
+	    cp "$$FILE" "$(disttmpdir)/$$FILE" || exit 1; \
+	  fi; \
+	done
+	tar cvf $(disttmpdir).tar $(disttmpdir)
+	gzip $(disttmpdir).tar
+	$(RM_REC) $(disttmpdir)
 
 #################################################
 # Debian package
@@ -266,7 +320,7 @@ deb: all
 	$(MKDIR) $(debpkgdir)
 	$(MKDIR) $(debpkgtmpdir)/DEBIAN
 
-	$(MAKE) prefix=$(debpkgtmpdir)/$(prefix) install
+	$(MAKE) DESTDIR=$(debpkgtmpdir)/ install-all
 
 	$(INSTALL_DATA) $(debpkgdir)/$(debpkgprefix).control $(debpkgtmpdir)/DEBIAN/control
 
@@ -381,3 +435,15 @@ macosx-dmg: macosx-standalone-app
 	$(HDIUTIL) detach /Volumes/UltraStarDeluxe
 	$(HDIUTIL) convert UltraStarDeluxe.sparseimage -format UDBZ -o UltraStarDeluxe.dmg
 	$(RM) UltraStarDeluxe.sparseimage
+
+# remove Mac OS X apllication bundle and disk image
+.PHONY: clean-macosx
+clean-macosx: clean-macosx-app clean-macosx-dmg
+
+.PHONY: clean-macosx-app
+clean-macosx-app:
+	$(RM_REC) UltraStarDeluxe.app 
+
+.PHONY: clean-macosx-dmg
+clean-macosx-dmg:
+	$(RM) UltraStarDeluxe.dmg 
-- 
cgit v1.2.3


From 0c922e18017b337db4580f44709666589482e747 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 9 Sep 2008 13:06:00 +0000
Subject: autogen.sh moved back to root

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1352 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 334a5bc7..f27d0af5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,8 +61,6 @@ USDX_LIB_DIR   := $(USDX_SRC_DIR)/lib
 
 INSTALL_DATADIR := $(datadir)/$(USDX_PACKAGE_NAME)
 
-AUTOGEN_DIR := $(srcdir)/dists/autogen
-
 #################################################
 # Binary name
 #################################################
@@ -186,7 +184,7 @@ config.status: configure
 
 .PHONE: reconf
 reconf:
-	$(AUTOGEN_DIR)/autogen.sh
+	./autogen.sh
 
 #################################################
 # install/uninstall
-- 
cgit v1.2.3


From 407de225f30f95e0d8724d7ed6e204641f121c69 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 10 Sep 2008 11:47:06 +0000
Subject: INSTALL_DATA -> INSTALL_PROGRAM

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1358 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index f27d0af5..15ce3f3b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,7 +39,7 @@ RM_REC       ?= $(RM) -r
 # install tool
 INSTALL         ?= @INSTALL@
 INSTALL_DATA    ?= @INSTALL_DATA@
-INSTALL_PROGRAM ?= @INSTALL_DATA@
+INSTALL_PROGRAM ?= @INSTALL_PROGRAM@
 
 #################################################
 # General package configuration
-- 
cgit v1.2.3


From abf47ddd1fe77287136535e2d05ada48b99b8e1f Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 12 Sep 2008 09:51:33 +0000
Subject: - Windows resources (.rc) reduced to the icon - Texture resource
 names are now directly written to resources.inc - Fonts are no resources
 anymore. They are moved to game/fonts and can be changed to support multiple
 charsets (until the TTF part is finished). Fonts are registered in
 fonts/fonts.in

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1367 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 15ce3f3b..7dd84313 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -80,7 +80,7 @@ USE_PROJECTM_CWRAPPER = @USE_PROJECTM_CWRAPPER@
 # Dependencies
 #################################################
 
-DEPS := $(USDX_TOOLS_DIR)/ResourceExtractor
+DEPS :=
 ifeq ($(USE_PROJECTM_CWRAPPER), yes)
 DEPS += $(PROJECTM_CWRAPPER_DIR)
 endif
@@ -223,20 +223,23 @@ install-exec:
 .PHONY: install-data
 install-data:
 	$(MAKE) RECURSIVE_SRC_DIR="artwork" \
-                RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/artwork" \
-                install-data-recursive
+            RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/artwork" \
+            install-data-recursive
 	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/languages" \
-                RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/languages" \
-                install-data-recursive
+            RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/languages" \
+            install-data-recursive
 	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/sounds" \
-                RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/sounds" \
-                install-data-recursive
+            RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/sounds" \
+            install-data-recursive
 	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/themes" \
-                RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/themes" \
-                install-data-recursive
+            RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/themes" \
+            install-data-recursive
+	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/fonts" \
+            RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/fonts" \
+            install-data-recursive
 	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/resources" \
-                RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/resources" \
-                install-data-recursive
+            RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/resources" \
+            install-data-recursive
 	$(INSTALL_DATA) "COPYING.txt" "$(DESTDIR)$(INSTALL_DATADIR)/COPYING.txt"
 
 .PHONY: install-data-recursive
@@ -270,6 +273,7 @@ uninstall-data:
 	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/languages"
 	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/sounds"
 	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/themes"
+	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/fonts"
 	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/resources"
 	$(RM)     "$(DESTDIR)$(INSTALL_DATADIR)/COPYING.txt"
 	-rmdir "$(DESTDIR)$(INSTALL_DATADIR)"
-- 
cgit v1.2.3


From b9b80e2c1366d1e09988de3d7240a8c8a7fb6273 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 31 Oct 2008 22:11:27 +0000
Subject: We need more space for resources

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1493 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 7dd84313..e0cfb440 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -430,7 +430,7 @@ endef
 .PHONY: macosx-dmg
 macosx-dmg: macosx-standalone-app
 	$(RM) UltraStarDeluxe.dmg
-	$(HDIUTIL) create -type SPARSE -size 30m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage
+	$(HDIUTIL) create -type SPARSE -size 40m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage
 	/bin/cp -R UltraStarDeluxe.app /Volumes/UltraStarDeluxe
 #	/bin/cp ultrastardx/icons/UltraStarDeluxeVolumeIcon.icns /Volumes/UltraStarDeluxe/.VolumeIcon.icns
 #	/Developer/Tools/SetFile -a C /Volumes/UltraStarDeluxe/.VolumeIcon.icns /Volumes/UltraStarDeluxe
-- 
cgit v1.2.3


From 7472888349e38ab5b453119020d7bf0bb44d6cb5 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 12 Nov 2008 19:24:21 +0000
Subject: typo corecction

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1516 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index e0cfb440..839bbb8f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -182,7 +182,7 @@ Makefile: $(srcdir)/Makefile.in $(USDX_SRC_DIR)/Makefile.in $(USDX_SRC_DIR)/conf
 config.status: configure
 	./config.status --recheck
 
-.PHONE: reconf
+.PHONY: reconf
 reconf:
 	./autogen.sh
 
-- 
cgit v1.2.3


From 65eed3b389761e9e5b9cf09c7c7456540ca10ce7 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 4 Mar 2009 18:06:26 +0000
Subject: Mac OS X only: change folder hierarchy in Application Support: delete
 Resources. Requires a new ./configure Attention: This requires manually
 moving all songs and anything else installed manually.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1618 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 839bbb8f..0a1113a4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -364,20 +364,20 @@ macosx-app: all
 	@echo "Creating the Mac OS X application"
 	@echo ""
 
-	$(MKDIR) $(macosx_bundle_path)/Resources
+	$(MKDIR) $(macosx_bundle_path)
 
 # Put the icon file into its particular place. 
 # Must be done BEFORE info.plist is created.
-	$(INSTALL_DATA) icons/ultrastardx.icns $(macosx_bundle_path)/Resources/
+	$(INSTALL_DATA) icons/ultrastardx.icns $(macosx_bundle_path)/
 
 # the info.plist file
 	$(INSTALL_DATA) $(USDX_SRC_DIR)/macosx/Info.plist $(macosx_bundle_path)/
 
 # Copy the resources. 
-	$(MAKE) install-all INSTALL_DATADIR=$(macosx_bundle_path)/Resources bindir=$(macosx_bundle_path)/MacOS
+	$(MAKE) install-all INSTALL_DATADIR=$(macosx_bundle_path) bindir=$(macosx_bundle_path)/MacOS
 
 # Create the song directory. 
-	$(MKDIR) $(macosx_bundle_path)/Resources/songs
+	$(MKDIR) $(macosx_bundle_path)/songs
 
 # final messages
 	@echo ""
-- 
cgit v1.2.3


From 91c0d6264ef2bde82c27c893bb962b1aa4e1546f Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 5 Mar 2009 17:43:28 +0000
Subject: the macosx icon file (ultrastardx.icns) must be in the folder
 resources

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1622 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 0a1113a4..ad94259d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -368,7 +368,8 @@ macosx-app: all
 
 # Put the icon file into its particular place. 
 # Must be done BEFORE info.plist is created.
-	$(INSTALL_DATA) icons/ultrastardx.icns $(macosx_bundle_path)/
+	$(MKDIR) $(macosx_bundle_path)/resources
+	$(INSTALL_DATA) icons/ultrastardx.icns $(macosx_bundle_path)/resources/
 
 # the info.plist file
 	$(INSTALL_DATA) $(USDX_SRC_DIR)/macosx/Info.plist $(macosx_bundle_path)/
-- 
cgit v1.2.3


From 9f9bae0844704ba541462fcc412480c21547f369 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 19 Apr 2009 10:49:59 +0000
Subject: configure and make for plugins

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1682 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index ad94259d..aaf9b9a1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,6 +58,7 @@ USDX_GAME_DIR  := $(top_srcdir)/game
 USDX_TOOLS_DIR := $(top_srcdir)/tools
 USDX_BUILD_DIR := $(top_srcdir)/build
 USDX_LIB_DIR   := $(USDX_SRC_DIR)/lib
+USDX_PLUGIN_DIR   := $(top_srcdir)/plugins
 
 INSTALL_DATADIR := $(datadir)/$(USDX_PACKAGE_NAME)
 
@@ -113,6 +114,7 @@ BUILD_TARGETS = all debug release rebuild build
 .PHONY: $(BUILD_TARGETS)
 $(BUILD_TARGETS): all-deps
 	$(MAKE) -C $(USDX_SRC_DIR) $@
+	$(MAKE) -C $(USDX_PLUGIN_DIR) all
 
 .PHONY: all-deps
 all-deps:
@@ -213,13 +215,22 @@ install-strip:
                 install
 
 .PHONY: install-all
-install-all: install-exec install-data
+install-all: install-exec install-plugins install-data
 
 .PHONY: install-exec
 install-exec:
 	$(MKDIR) "$(DESTDIR)$(bindir)"
 	$(INSTALL_PROGRAM) "$(USDX_BIN)" "$(DESTDIR)$(bindir)"
 
+# FPC target platform and processor
+PPLATFORM  := @FPC_PLATFORM@
+PPROCESSOR := @FPC_PROCESSOR@
+
+.PHONY: install-plugins
+install-plugins:
+	$(MKDIR) "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
+	$(INSTALL) "$(USDX_BUILD_DIR)"/fpc-$(PPROCESSOR)-$(PPLATFORM)/lib* "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
+
 .PHONY: install-data
 install-data:
 	$(MAKE) RECURSIVE_SRC_DIR="artwork" \
@@ -265,7 +276,7 @@ install-data-recursive:
 uninstall: uninstall-all
 
 .PHONY: uninstall-all
-uninstall-all: uninstall-data uninstall-exec
+uninstall-all: uninstall-data uninstall-exec uninstall-plugins
 
 .PHONY: uninstall-data
 uninstall-data:
@@ -282,6 +293,10 @@ uninstall-data:
 uninstall-exec:
 	$(RM) "$(DESTDIR)$(bindir)/$(USDX_BIN_NAME)"
 
+.PHONY: uninstall-plugins
+uninstall-plugins:
+	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
+
 #################################################
 # Distributable source-package (TODO)
 #################################################
-- 
cgit v1.2.3


From 43983455b499d4355edfe1e69c7a93c58c7f2beb Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 19 Apr 2009 13:39:11 +0000
Subject: better version for make and install the plugins

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1684 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index aaf9b9a1..a5b6cb64 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -229,7 +229,7 @@ PPROCESSOR := @FPC_PROCESSOR@
 .PHONY: install-plugins
 install-plugins:
 	$(MKDIR) "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
-	$(INSTALL) "$(USDX_BUILD_DIR)"/fpc-$(PPROCESSOR)-$(PPLATFORM)/lib* "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
+	$(INSTALL) "$(USDX_GAME_DIR)/plugins"/* "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
 
 .PHONY: install-data
 install-data:
-- 
cgit v1.2.3


From 03fa341f5731d1d36327e5d7e923609b081b72cb Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 20 Apr 2009 11:26:11 +0000
Subject: increase initial size of Mac OS X diskimage

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1688 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index a5b6cb64..3b05e66f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -446,7 +446,7 @@ endef
 .PHONY: macosx-dmg
 macosx-dmg: macosx-standalone-app
 	$(RM) UltraStarDeluxe.dmg
-	$(HDIUTIL) create -type SPARSE -size 40m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage
+	$(HDIUTIL) create -type SPARSE -size 100m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage
 	/bin/cp -R UltraStarDeluxe.app /Volumes/UltraStarDeluxe
 #	/bin/cp ultrastardx/icons/UltraStarDeluxeVolumeIcon.icns /Volumes/UltraStarDeluxe/.VolumeIcon.icns
 #	/Developer/Tools/SetFile -a C /Volumes/UltraStarDeluxe/.VolumeIcon.icns /Volumes/UltraStarDeluxe
-- 
cgit v1.2.3


From 34538e9cf15e1c7b50c32cd4f2b563d6e0320a58 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 8 Jun 2009 11:16:49 +0000
Subject: increase verbosity of Mac OS X hdiutil for easier tracking of errors
 when creating disk images

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1803 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 3b05e66f..52f880a4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -446,12 +446,12 @@ endef
 .PHONY: macosx-dmg
 macosx-dmg: macosx-standalone-app
 	$(RM) UltraStarDeluxe.dmg
-	$(HDIUTIL) create -type SPARSE -size 100m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage
+	$(HDIUTIL)  -verbose create -type SPARSE -size 100m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage
 	/bin/cp -R UltraStarDeluxe.app /Volumes/UltraStarDeluxe
 #	/bin/cp ultrastardx/icons/UltraStarDeluxeVolumeIcon.icns /Volumes/UltraStarDeluxe/.VolumeIcon.icns
 #	/Developer/Tools/SetFile -a C /Volumes/UltraStarDeluxe/.VolumeIcon.icns /Volumes/UltraStarDeluxe
-	$(HDIUTIL) detach /Volumes/UltraStarDeluxe
-	$(HDIUTIL) convert UltraStarDeluxe.sparseimage -format UDBZ -o UltraStarDeluxe.dmg
+	$(HDIUTIL)  -verbose detach /Volumes/UltraStarDeluxe
+	$(HDIUTIL)  -verbose convert UltraStarDeluxe.sparseimage -format UDBZ -o UltraStarDeluxe.dmg
 	$(RM) UltraStarDeluxe.sparseimage
 
 # remove Mac OS X apllication bundle and disk image
-- 
cgit v1.2.3


From 77227df63dedc802a8017e1e65d6752a5de14fae Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 8 Jun 2009 12:16:20 +0000
Subject: increase verbosity of Mac OS X hdiutil for easier tracking of errors
 when creating disk images. previous commit had wrong order of options

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1804 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 52f880a4..a30b81c4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -446,12 +446,12 @@ endef
 .PHONY: macosx-dmg
 macosx-dmg: macosx-standalone-app
 	$(RM) UltraStarDeluxe.dmg
-	$(HDIUTIL)  -verbose create -type SPARSE -size 100m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage
+	$(HDIUTIL) create -verbose -type SPARSE -size 100m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage
 	/bin/cp -R UltraStarDeluxe.app /Volumes/UltraStarDeluxe
 #	/bin/cp ultrastardx/icons/UltraStarDeluxeVolumeIcon.icns /Volumes/UltraStarDeluxe/.VolumeIcon.icns
 #	/Developer/Tools/SetFile -a C /Volumes/UltraStarDeluxe/.VolumeIcon.icns /Volumes/UltraStarDeluxe
-	$(HDIUTIL)  -verbose detach /Volumes/UltraStarDeluxe
-	$(HDIUTIL)  -verbose convert UltraStarDeluxe.sparseimage -format UDBZ -o UltraStarDeluxe.dmg
+	$(HDIUTIL) detach -verbose /Volumes/UltraStarDeluxe
+	$(HDIUTIL) convert -verbose UltraStarDeluxe.sparseimage -format UDBZ -o UltraStarDeluxe.dmg
 	$(RM) UltraStarDeluxe.sparseimage
 
 # remove Mac OS X apllication bundle and disk image
-- 
cgit v1.2.3


From d8650874e39ffe6f141ef919539ea956de9d1f16 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 9 Jun 2009 07:10:00 +0000
Subject: another try to fix failing Mac OS X disk image creation

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1805 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index a30b81c4..f16833ed 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -446,7 +446,9 @@ endef
 .PHONY: macosx-dmg
 macosx-dmg: macosx-standalone-app
 	$(RM) UltraStarDeluxe.dmg
-	$(HDIUTIL) create -verbose -type SPARSE -size 100m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage
+	$(RM) UltraStarDeluxe.sparseimage
+	$(HDIUTIL) create -verbose -type SPARSE -size 100m -fs HFS+ -volname UltraStarDeluxe -ov UltraStarDeluxe.sparseimage
+	$(HDIUTIL) attach -verbose UltraStarDeluxe.sparseimage
 	/bin/cp -R UltraStarDeluxe.app /Volumes/UltraStarDeluxe
 #	/bin/cp ultrastardx/icons/UltraStarDeluxeVolumeIcon.icns /Volumes/UltraStarDeluxe/.VolumeIcon.icns
 #	/Developer/Tools/SetFile -a C /Volumes/UltraStarDeluxe/.VolumeIcon.icns /Volumes/UltraStarDeluxe
@@ -465,3 +467,4 @@ clean-macosx-app:
 .PHONY: clean-macosx-dmg
 clean-macosx-dmg:
 	$(RM) UltraStarDeluxe.dmg 
+	$(RM) UltraStarDeluxe.sparseimage
-- 
cgit v1.2.3


From 61f3f04370d76924ebd588175a3c3ec573c70435 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 9 Jun 2009 12:40:24 +0000
Subject: Remove -verbose option. Reason for failure was incomplete update of
 python and buildbot from 2.5 to 2.6

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1806 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index f16833ed..1b4f7707 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -447,13 +447,13 @@ endef
 macosx-dmg: macosx-standalone-app
 	$(RM) UltraStarDeluxe.dmg
 	$(RM) UltraStarDeluxe.sparseimage
-	$(HDIUTIL) create -verbose -type SPARSE -size 100m -fs HFS+ -volname UltraStarDeluxe -ov UltraStarDeluxe.sparseimage
-	$(HDIUTIL) attach -verbose UltraStarDeluxe.sparseimage
+	$(HDIUTIL) create -type SPARSE -size 100m -fs HFS+ -volname UltraStarDeluxe -ov UltraStarDeluxe.sparseimage
+	$(HDIUTIL) attach UltraStarDeluxe.sparseimage
 	/bin/cp -R UltraStarDeluxe.app /Volumes/UltraStarDeluxe
 #	/bin/cp ultrastardx/icons/UltraStarDeluxeVolumeIcon.icns /Volumes/UltraStarDeluxe/.VolumeIcon.icns
 #	/Developer/Tools/SetFile -a C /Volumes/UltraStarDeluxe/.VolumeIcon.icns /Volumes/UltraStarDeluxe
-	$(HDIUTIL) detach -verbose /Volumes/UltraStarDeluxe
-	$(HDIUTIL) convert -verbose UltraStarDeluxe.sparseimage -format UDBZ -o UltraStarDeluxe.dmg
+	$(HDIUTIL) detach /Volumes/UltraStarDeluxe
+	$(HDIUTIL) convert UltraStarDeluxe.sparseimage -format UDBZ -o UltraStarDeluxe.dmg
 	$(RM) UltraStarDeluxe.sparseimage
 
 # remove Mac OS X apllication bundle and disk image
-- 
cgit v1.2.3


From 9de40e67e51955576c87785db0c6ce98050c64fd Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 26 Jul 2009 13:22:11 +0000
Subject: - Disable plugins as most linux distributions use the buggy
 binutils-2.19.1 (upcoming Ubuntu 9.10 will use a different one). In addition
 the dll-plugins are very instable and probably will not used in the release
 in favor of the lua ones. - If you really want this stuff, make them
 manually: cd plugins make

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1925 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 1b4f7707..2772147d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -114,7 +114,7 @@ BUILD_TARGETS = all debug release rebuild build
 .PHONY: $(BUILD_TARGETS)
 $(BUILD_TARGETS): all-deps
 	$(MAKE) -C $(USDX_SRC_DIR) $@
-	$(MAKE) -C $(USDX_PLUGIN_DIR) all
+#	$(MAKE) -C $(USDX_PLUGIN_DIR) all
 
 .PHONY: all-deps
 all-deps:
@@ -215,7 +215,7 @@ install-strip:
                 install
 
 .PHONY: install-all
-install-all: install-exec install-plugins install-data
+install-all: install-exec install-data
 
 .PHONY: install-exec
 install-exec:
-- 
cgit v1.2.3


From 917901e8e33438c425aef50a0a7417f32d77b760 Mon Sep 17 00:00:00 2001
From: s_alexander <s_alexander@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 9 Nov 2009 00:27:55 +0000
Subject: merged unicode branch (r1931) into trunk

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1939 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 2772147d..535f7dc9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -215,6 +215,7 @@ install-strip:
                 install
 
 .PHONY: install-all
+#install-all: install-exec install-plugins install-data
 install-all: install-exec install-data
 
 .PHONY: install-exec
-- 
cgit v1.2.3


From d6bdcf5e9f9cc70fd307b3ee76cd0fcba7c997f5 Mon Sep 17 00:00:00 2001
From: s_alexander <s_alexander@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 12 Jan 2010 19:29:17 +0000
Subject: removed plugin stuff

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2077 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 535f7dc9..74d19a31 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,7 +58,6 @@ USDX_GAME_DIR  := $(top_srcdir)/game
 USDX_TOOLS_DIR := $(top_srcdir)/tools
 USDX_BUILD_DIR := $(top_srcdir)/build
 USDX_LIB_DIR   := $(USDX_SRC_DIR)/lib
-USDX_PLUGIN_DIR   := $(top_srcdir)/plugins
 
 INSTALL_DATADIR := $(datadir)/$(USDX_PACKAGE_NAME)
 
@@ -114,7 +113,6 @@ BUILD_TARGETS = all debug release rebuild build
 .PHONY: $(BUILD_TARGETS)
 $(BUILD_TARGETS): all-deps
 	$(MAKE) -C $(USDX_SRC_DIR) $@
-#	$(MAKE) -C $(USDX_PLUGIN_DIR) all
 
 .PHONY: all-deps
 all-deps:
@@ -141,7 +139,6 @@ clean-game:
 	$(RM) $(USDX_GAME_DIR)/*.db
 	$(RM) $(USDX_GAME_DIR)/*.ini
 	-rmdir $(USDX_GAME_DIR)/screenshots
-	-rmdir $(USDX_GAME_DIR)/plugins
 	-rmdir $(USDX_GAME_DIR)/playlists
 	-rmdir $(USDX_GAME_DIR)/songs
 
@@ -227,11 +224,6 @@ install-exec:
 PPLATFORM  := @FPC_PLATFORM@
 PPROCESSOR := @FPC_PROCESSOR@
 
-.PHONY: install-plugins
-install-plugins:
-	$(MKDIR) "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
-	$(INSTALL) "$(USDX_GAME_DIR)/plugins"/* "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
-
 .PHONY: install-data
 install-data:
 	$(MAKE) RECURSIVE_SRC_DIR="artwork" \
@@ -294,10 +286,6 @@ uninstall-data:
 uninstall-exec:
 	$(RM) "$(DESTDIR)$(bindir)/$(USDX_BIN_NAME)"
 
-.PHONY: uninstall-plugins
-uninstall-plugins:
-	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
-
 #################################################
 # Distributable source-package (TODO)
 #################################################
-- 
cgit v1.2.3


From 1442feae91411a54bcb0d7a1aafdc607a01e0269 Mon Sep 17 00:00:00 2001
From: s_alexander <s_alexander@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 12 Jan 2010 20:12:21 +0000
Subject: reverted accidentally removed plugin install/unstall routines

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2083 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 74d19a31..79a128ce 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -224,6 +224,11 @@ install-exec:
 PPLATFORM  := @FPC_PLATFORM@
 PPROCESSOR := @FPC_PROCESSOR@
 
+.PHONY: install-plugins
+install-plugins:
+	$(MKDIR) "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
+	$(INSTALL) "$(USDX_GAME_DIR)/plugins"/* "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
+
 .PHONY: install-data
 install-data:
 	$(MAKE) RECURSIVE_SRC_DIR="artwork" \
@@ -286,6 +291,10 @@ uninstall-data:
 uninstall-exec:
 	$(RM) "$(DESTDIR)$(bindir)/$(USDX_BIN_NAME)"
 
+.PHONY: uninstall-plugins
+uninstall-plugins:
+	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/plugins"
+
 #################################################
 # Distributable source-package (TODO)
 #################################################
-- 
cgit v1.2.3


From 0f62907b1578fb36aeeceb6e14a7b36897cb00b6 Mon Sep 17 00:00:00 2001
From: s_alexander <s_alexander@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 12 Jan 2010 20:12:56 +0000
Subject: install plugins with install-all

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2084 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 79a128ce..e0a93079 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -212,8 +212,7 @@ install-strip:
                 install
 
 .PHONY: install-all
-#install-all: install-exec install-plugins install-data
-install-all: install-exec install-data
+install-all: install-exec install-plugins install-data
 
 .PHONY: install-exec
 install-exec:
-- 
cgit v1.2.3


From 8fa80a09047f159407872a067c6b0ab0447a239e Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 19 Mar 2010 21:11:27 +0000
Subject: install the lua plugins in the application bundle.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2209 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index e0a93079..0fa2ac4b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -389,6 +389,9 @@ macosx-app: all
 # Copy the resources. 
 	$(MAKE) install-all INSTALL_DATADIR=$(macosx_bundle_path) bindir=$(macosx_bundle_path)/MacOS
 
+# Copy the lua plugins. 
+	$(MAKE) install-plugins INSTALL_DATADIR=$(macosx_bundle_path) bindir=$(macosx_bundle_path)/MacOS
+
 # Create the song directory. 
 	$(MKDIR) $(macosx_bundle_path)/songs
 
-- 
cgit v1.2.3


From 0207b9ae7d3737f2d5efef733eabbde20f57644b Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 2 May 2010 08:29:13 +0000
Subject: artwork directory removed

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2330 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 0fa2ac4b..1f36c8e7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -230,9 +230,6 @@ install-plugins:
 
 .PHONY: install-data
 install-data:
-	$(MAKE) RECURSIVE_SRC_DIR="artwork" \
-            RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/artwork" \
-            install-data-recursive
 	$(MAKE) RECURSIVE_SRC_DIR="$(USDX_GAME_DIR)/languages" \
             RECURSIVE_DST_DIR="$(DESTDIR)$(INSTALL_DATADIR)/languages" \
             install-data-recursive
@@ -277,7 +274,6 @@ uninstall-all: uninstall-data uninstall-exec uninstall-plugins
 
 .PHONY: uninstall-data
 uninstall-data:
-	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/artwork"
 	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/languages"
 	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/sounds"
 	$(RM_REC) "$(DESTDIR)$(INSTALL_DATADIR)/themes"
-- 
cgit v1.2.3


From 9c7b3f021b4b58dcb283a0fe7fe896d6d3821176 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 11 Jun 2010 07:50:25 +0000
Subject: Mac OS X: fix installation and loading of libpcre.dylib in standalone
 and fink based app.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2483 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 1f36c8e7..237565f5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -358,6 +358,8 @@ OTOOL := /usr/bin/otool
 INSTALL_NAME_TOOL := /usr/bin/install_name_tool
 # hdiutil: Mac OS X disk image tool
 HDIUTIL := /usr/bin/hdiutil
+# finkLibDir := path for libraries installed using fink
+finkLibDir := /sw/lib
 
 #################################################
 # Mac OS X app-bundle
@@ -425,16 +427,19 @@ endef
 
 # work on the secondary dylibs from ffmpeg
 # libavcodec references all tertiary libraries of the ffmpeg libs
-	$(foreach dylib,$(shell $(OTOOL) -L /sw/lib/libavcodec.dylib   | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+	$(foreach dylib,$(shell $(OTOOL) -L $(finkLibDir)/libavcodec.dylib   | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
 # same procedure in libfaac. it gets libgnugetopt
-	$(foreach dylib,$(shell $(OTOOL) -L /sw/lib/libfaac.dylib      | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+	$(foreach dylib,$(shell $(OTOOL) -L $(finkLibDir)/libfaac.dylib      | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
 
 # same procedure for tertiary libs in SDL_image
-	$(foreach dylib,$(shell $(OTOOL) -L /sw/lib/libSDL_image.dylib | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
+	$(foreach dylib,$(shell $(OTOOL) -L $(finkLibDir)/libSDL_image.dylib | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
 
 # X11 libs as well, because users may not have installed it on 10.4
 	$(foreach dylib,$(shell $(OTOOL) -L /usr/X11R6/lib/libX11.dylib  | grep version | cut -f 1 -d ' ' | grep -v \/System\/Library | grep -v \/usr\/lib),$(install_osx_libraries))
 
+# libpcre.dylib must be installed extra, since it is not linked to the executable but opened using dlopen
+	$(shell $(INSTALL) -m 755 $(finkLibDir)/libpcre.dylib $(macosx_bundle_path)/MacOS)
+
 # final messages
 	@echo "Standalone Mac OS X application created."
 	@echo ""
-- 
cgit v1.2.3


From faa3f2d4c9e02d02e70c29ced331370a0b62009c Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 16 Jun 2010 18:15:55 +0000
Subject: Finally fix libpcre.dylib in the Mac OS X stand-alone application
 bundle

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2531 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Makefile.in | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 237565f5..7e9450a6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -439,6 +439,8 @@ endef
 
 # libpcre.dylib must be installed extra, since it is not linked to the executable but opened using dlopen
 	$(shell $(INSTALL) -m 755 $(finkLibDir)/libpcre.dylib $(macosx_bundle_path)/MacOS)
+	$(shell $(INSTALL_NAME_TOOL) -change $(finkLibDir)/libpcre.dylib @executable_path/libpcre.dylib $(macosx_bundle_path)/MacOS/libpcre.dylib)
+	$(shell $(INSTALL_NAME_TOOL) -id @executable_path/libpcre.dylib $(macosx_bundle_path)/MacOS/libpcre.dylib)
 
 # final messages
 	@echo "Standalone Mac OS X application created."
-- 
cgit v1.2.3