Unstaged changes (WIP)

[sdk] / Makefile

diff --git a/Makefile b/Makefile
index 4da9f82..56fd5e3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 .PHONY: all clean realclean distclean emptyoutput prepinstall actualinstall install copyonlyinstall uninstall troubleshoot outputdirs bootstrap deps ecere ecerecom ecerevanilla ear compiler prepbinaries epj2make ide documentor eda prepcodeguard codeguard fixprecompile cleantarget pots installer regenbootstrap updatebootstrap update_ecere update_libec update_ecp update_ecc update_ecs ecereaudio
-ifneq "$V" "1"
+ifneq "$(V)" "1"
 .SILENT:
 endif
 
@@ -18,15 +18,19 @@ XBOOT := $(if $(CROSS_TARGET),GCC_PREFIX= TARGET_PLATFORM=$(HOST_PLATFORM) PLATF
 
 LIBVER := .0.44
 
-ifneq "$ECERE_AUDIO" "n"
+ifndef ECERE_AUDIO
+ECERE_AUDIO := n
+
 ifdef WINDOWS_TARGET
 ECERE_AUDIO := y
 endif
 
 ifdef LINUX_TARGET
+ifndef BSD_TARGET
 ECERE_AUDIO := y
 endif
 endif
+endif
 
 ifdef WINDOWS_HOST
 HOST_SOV := $(HOST_SO)
@@ -300,9 +304,9 @@ epj2make: prepbinaries
        cd epj2make && $(MAKE)
 
 ecereaudio: prepbinaries
-ifdef ECERE_AUDIO
+ifneq "$(ECERE_AUDIO)" "n"
        @$(call echo,Building EcereAudio...)
-       cd extras/audio && $(MAKE)
+       cd audio && $(MAKE)
 endif
 
 ide: prepbinaries
@@ -356,7 +360,7 @@ emptyoutput: outputdirs
 ifdef EDASQLiteCipher
        $(call rmq,$(SODESTDIR)$(LP)EDASQLiteCipher$(SO))
 endif
-ifdef ECERE_AUDIO
+ifneq "$(ECERE_AUDIO)" "n"
        $(call rmq,$(SODESTDIR)$(LP)EcereAudio$(SO))
 endif
 ifdef LINUX_TARGET
@@ -368,7 +372,7 @@ ifdef LINUX_TARGET
 ifdef EDASQLiteCipher
        $(call rmq,$(SODESTDIR)$(LP)EDASQLiteCipher$(SO).0)
 endif
-ifdef ECERE_AUDIO
+ifneq "$(ECERE_AUDIO)" "n"
        $(call rmq,$(SODESTDIR)$(LP)EcereAudio$(SO).0)
 endif
        $(call rmq,$(SODESTDIR)$(LP)ecere$(SOV))
@@ -379,7 +383,7 @@ endif
 ifdef EDASQLiteCipher
        $(call rmq,$(SODESTDIR)$(LP)EDASQLiteCipher$(SOV))
 endif
-ifdef ECERE_AUDIO
+ifneq "$(ECERE_AUDIO)" "n"
        $(call rmq,$(SODESTDIR)$(LP)EcereAudio$(SOV))
 endif
 endif  
@@ -403,6 +407,9 @@ cleantarget:
        cd epj2make && $(MAKE) cleantarget
        cd ide && $(MAKE) cleantarget
        cd installer && $(MAKE) cleantarget
+ifneq "$(ECERE_AUDIO)" "n"
+       cd audio && $(MAKE) cleantarget
+endif
 
 pots: cleantarget
        $(MAKE) OUTPUT_POT=1
@@ -429,6 +436,9 @@ endif
        cd epj2make && $(MAKE) clean
        cd ide && $(MAKE) clean
        cd documentor && $(MAKE) clean
+ifneq "$(ECERE_AUDIO)" "n"
+       cd audio && $(MAKE) clean
+endif
 ifdef CodeGuard
        cd codeGuard && $(MAKE) clean
 endif
@@ -445,6 +455,9 @@ endif
        cd epj2make && $(MAKE) realclean
        cd ide && $(MAKE) realclean
        cd documentor && $(MAKE) realclean
+ifneq "$(ECERE_AUDIO)" "n"
+       cd audio && $(MAKE) realclan
+endif
 ifdef CodeGuard
        cd codeGuard && $(MAKE) realclean
 endif
@@ -462,6 +475,9 @@ endif
        cd epj2make && $(MAKE) distclean
        cd ide && $(MAKE) distclean
        cd documentor && $(MAKE) distclean
+ifneq "$(ECERE_AUDIO)" "n"
+       cd audio && $(MAKE) distclean
+endif
 ifdef CodeGuard
        cd codeGuard && $(MAKE) distclean
 endif
@@ -486,8 +502,8 @@ BINARIES = \
        eda/libeda/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDA$(SOV) \
        eda/drivers/sqlite/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLite$(SOV)
 
-ifdef ECERE_AUDIO
-BINARIES += extras/audio/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EcereAudio$(SOV)
+ifneq "$(ECERE_AUDIO)" "n"
+BINARIES += audio/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EcereAudio$(SOV)
 endif
 
 ifdef CodeGuard
@@ -510,8 +526,8 @@ ifdef WINDOWS_TARGET
        $(call cpq,compiler/libec/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)ec$(SO),$(OBJBINDIR))
        $(call cpq,eda/libeda/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDA$(SO),$(OBJBINDIR))
        $(call cpq,eda/drivers/sqlite/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLite$(SO),$(OBJBINDIR))
-ifdef ECERE_AUDIO
-       $(call cpq,extras/audio/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EcereAudio$(SO),$(OBJBINDIR))
+ifneq "$(ECERE_AUDIO)" "n"
+       $(call cpq,audio/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EcereAudio$(SO),$(OBJBINDIR))
 endif
 ifdef EDASQLiteCipher
        $(call cpq,eda/drivers/sqliteCipher/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLiteCipher$(SO),$(OBJBINDIR))
@@ -524,8 +540,8 @@ ifdef LINUX_TARGET
        $(call cpq,compiler/libec/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)ec$(SOV),$(OBJLIBDIR))
        $(call cpq,eda/libeda/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDA$(SOV),$(OBJLIBDIR))
        $(call cpq,eda/drivers/sqlite/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLite$(SOV),$(OBJLIBDIR))
-ifdef ECERE_AUDIO
-       $(call cpq,extras/audio/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EcereAudio$(SOV),$(OBJLIBDIR))
+ifneq "$(ECERE_AUDIO)" "n"
+       $(call cpq,audio/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EcereAudio$(SOV),$(OBJLIBDIR))
 endif
 ifdef EDASQLiteCipher
        $(call cpq,eda/drivers/sqliteCipher/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLiteCipher$(SOV),$(OBJLIBDIR))
@@ -538,6 +554,10 @@ endif
 ifdef EDASQLiteCipher
        ln -sf $(LP)EDASQLiteCipher$(SOV) $(OBJLIBDIR)$(LP)EDASQLiteCipher$(SO).0
 endif
+ifneq "$(ECERE_AUDIO)" "n"
+       ln -sf $(LP)EcereAudio$(SOV) $(OBJLIBDIR)$(LP)EcereAudio$(SO).0
+endif
+
        ln -sf $(LP)ecere$(SOV) $(OBJLIBDIR)$(LP)ecere$(SO)
        ln -sf $(LP)ecereCOM$(SOV) $(OBJLIBDIR)$(LP)ecereCOM$(SO)
        ln -sf $(LP)ec$(SOV) $(OBJLIBDIR)$(LP)ec$(SO)
@@ -546,6 +566,7 @@ endif
 ifdef EDASQLiteCipher
        ln -sf $(LP)EDASQLiteCipher$(SOV) $(OBJLIBDIR)$(LP)EDASQLiteCipher$(SO)
 endif
+       ln -sf $(LP)EcereAudio$(SOV) $(OBJLIBDIR)$(LP)EcereAudio$(SO)
 endif
 
 ifndef WINDOWS_TARGET
@@ -555,8 +576,8 @@ ifndef LINUX_TARGET
        $(call cpq,compiler/libec/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)ec$(SO),$(OBJLIBDIR))
        $(call cpq,eda/libeda/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDA$(SO),$(OBJLIBDIR))
        $(call cpq,eda/drivers/sqlite/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLite$(SO),$(OBJLIBDIR))
-ifdef ECERE_AUDIO
-       $(call cpq,extras/audio/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EcereAudio$(SO),$(OBJLIBDIR))
+ifneq "$(ECERE_AUDIO)" "n"
+       $(call cpq,audio/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EcereAudio$(SO),$(OBJLIBDIR))
 endif
 ifdef EDASQLiteCipher
        $(call cpq,eda/drivers/sqliteCipher/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EDASQLiteCipher$(SO),$(OBJLIBDIR))
@@ -596,7 +617,7 @@ ifdef WINDOWS_TARGET
 ifdef EDASQLiteCipher
        $(call cpq,$(OBJBINDIR)$(LP)EDASQLiteCipher$(SO),"$(DESTLIBDIR)/")
 endif
-ifdef ECERE_AUDIO
+ifneq "$(ECERE_AUDIO)" "n"
        $(call cpq,$(OBJBINDIR)$(LP)EcereAudio$(SO),"$(DESTLIBDIR)/")
 endif
        $(call cpq,$(OBJBINDIR)ide$(E),"$(BINDIR)/")
@@ -625,8 +646,8 @@ ifdef OSX_TARGET
 ifdef EDASQLiteCipher
        install $(OBJLIBDIR)$(LP)EDASQLiteCipher$(SO) $(DESTLIBDIR)/
 endif
-ifdef ECERE_AUDIO
-       install $(OBJBINDIR)$(LP)EcereAudio$(SO) $(DESTLIBDIR)/
+ifneq "$(ECERE_AUDIO)" "n"
+       install $(OBJLIBDIR)$(LP)EcereAudio$(SO) $(DESTLIBDIR)/
 endif
        install $(OBJBINDIR)ide$(E) $(BINDIR)/
        install $(OBJBINDIR)ear$(E) $(BINDIR)/
@@ -651,7 +672,6 @@ endif
        find $(SAMPLESDIR) -type d -exec chmod 777 {} \;
        mkdir -p $(EXTRASDIR)
        cp -pRf extras/* $(EXTRASDIR)
-       chmod 777 $(EXTRASDIR)/audio
 endif
 
 ifndef OSX_TARGET
@@ -666,8 +686,8 @@ ifdef LINUX_TARGET
 ifdef EDASQLiteCipher
        install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)EDASQLiteCipher$(SOV) $(DESTLIBDIR)/ec/$(LP)EDASQLiteCipher$(SOV)
 endif
-ifdef ECERE_AUDIO
-       install $(INSTALL_FLAGS) $(OBJBINDIR)$(LP)EcereAudio$(SO) $(DESTLIBDIR)/ec/$(LP)EcereAudio$(SOV)
+ifneq "$(ECERE_AUDIO)" "n"
+       install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)EcereAudio$(SO) $(DESTLIBDIR)/ec/$(LP)EcereAudio$(SOV)
 endif
        ln -sf $(LP)ecere$(SOV) $(DESTLIBDIR)/$(LP)ecere$(SO).0
        ln -sf $(LP)ecereCOM$(SOV) $(DESTLIBDIR)/$(LP)ecereCOM$(SO).0
@@ -677,7 +697,7 @@ endif
 ifdef EDASQLiteCipher
        ln -sf $(LP)EDASQLiteCipher$(SOV) $(DESTLIBDIR)/ec/$(LP)EDASQLiteCipher$(SO).0
 endif
-ifdef ECERE_AUDIO
+ifneq "$(ECERE_AUDIO)" "n"
        ln -sf $(LP)EcereAudio$(SOV) $(DESTLIBDIR)/ec/$(LP)EcereAudio$(SO).0
 endif
        ln -sf $(LP)ecere$(SOV) $(DESTLIBDIR)/$(LP)ecere$(SO)
@@ -690,6 +710,9 @@ endif
 ifdef EDASQLiteCipher
        ln -sf $(LP)EDASQLiteCipher$(SOV) $(DESTLIBDIR)/ec/$(LP)EDASQLiteCipher$(SO)
 endif
+ifneq "$(ECERE_AUDIO)" "n"
+       ln -sf $(LP)EcereAudio$(SOV) $(DESTLIBDIR)/ec/$(LP)EcereAudio$(SO)
+endif
 ifndef BSD_HOST
        install $(INSTALL_FLAGS) -m 644 share/pixmaps/ecere.png $(DESTDIR)$(prefix)/share/pixmaps/ecere.png
        install $(INSTALL_FLAGS) -m 644 share/applications/ecere.desktop $(DESTDIR)$(prefix)/share/applications/ecere.desktop
@@ -697,15 +720,6 @@ endif
 else
        install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)ecere$(SO) $(DESTLIBDIR)/$(LP)ecere$(SO)
        install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)ecereCOM$(SO) $(DESTLIBDIR)/$(LP)ecereCOM$(SO)
-       install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)ec$(SO) $(DESTLIBDIR)/$(LP)ec$(SO)
-       install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)EDA$(SO) $(DESTLIBDIR)/$(LP)EDA$(SO)
-       install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)EDASQLite$(SO) $(DESTLIBDIR)/$(LP)EDASQLite$(SO)
-ifdef EDASQLiteCipher
-       install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)EDASQLiteCipher$(SO) $(DESTLIBDIR)/$(LP)EDASQLiteCipher$(SO)
-endif
-endif
-ifdef ECERE_AUDIO
-       install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)EcereAudio$(SO) $(DESTLIBDIR)/$(LP)EcereAudio$(SO)
 endif
        install $(INSTALL_FLAGS) $(OBJBINDIR)ide$(E) $(BINDIR)/ide$(E)
        install $(INSTALL_FLAGS) $(OBJBINDIR)ear$(E) $(BINDIR)/ear$(E)
@@ -733,7 +747,6 @@ endif
        find $(SAMPLESDIR) -type d -exec chmod 777 {} \;
        mkdir -p $(EXTRASDIR)
        cp $(CPFLAGS) extras/* $(EXTRASDIR)
-       chmod 777 $(EXTRASDIR)/audio
 ifdef DEBIAN_PACKAGE
        mkdir -p $(DESTDIR)$(prefix)/share/doc/libecere0
        install $(INSTALL_FLAG) -m644 NEWS $(DESTDIR)$(prefix)/share/doc/libecere0/changelog
@@ -755,7 +768,7 @@ ifdef DEBIAN_PACKAGE
        mkdir -p $(DESTDIR)$(prefix)/share/doc/libedasqlite0
        ln -sf ../libecere0/changelog.gz $(DESTDIR)$(prefix)/share/doc/libedasqlite0/
        mkdir -p $(DESTDIR)$(prefix)/share/doc/libecereaudio0
-       ln -sf ../libecere0/changelog.gz $(DESTDIR)$(prefix)/share/doc/libecereaudio/
+       ln -sf ../libecere0/changelog.gz $(DESTDIR)$(prefix)/share/doc/libecereaudio0/
 endif
 endif
 endif
@@ -765,13 +778,23 @@ uninstall:
        $(call rmq,"$(DESTLIBDIR)/$(LP)ecereCOM$(SO)")
        $(call rmq,"$(DESTLIBDIR)/$(LP)ec$(SO)")
        $(call rmq,"$(DESTLIBDIR)/$(LP)EDA$(SO)")
+ifdef LINUX_TARGET
+       $(call rmq,"$(DESTLIBDIR)/ec/$(LP)EDASQLite$(SO)")
+ifdef EDASQLiteCipher
+       $(call rmq,"$(DESTLIBDIR)/ec/$(LP)EDASQLiteCipher$(SO)")
+endif
+ifneq "$(ECERE_AUDIO)" "n"
+       $(call rmq,"$(DESTLIBDIR)/ec/$(LP)EcereAudio$(SO)")
+endif
+else
        $(call rmq,"$(DESTLIBDIR)/$(LP)EDASQLite$(SO)")
 ifdef EDASQLiteCipher
        $(call rmq,"$(DESTLIBDIR)/$(LP)EDASQLiteCipher$(SO)")
 endif
-ifdef ECERE_AUDIO
+ifneq "$(ECERE_AUDIO)" "n"
        $(call rmq,"$(DESTLIBDIR)/$(LP)EcereAudio$(SO)")
 endif
+endif
        $(call rmq,"$(BINDIR)/ide$(E)")
        $(call rmq,"$(BINDIR)/ear$(E)")
        $(call rmq,"$(BINDIR)/ecc$(E)")
@@ -790,23 +813,23 @@ endif
 ifdef LINUX_TARGET
        $(call rmq,"$(DESTLIBDIR)/$(LP)ecere$(SO).0")
        $(call rmq,"$(DESTLIBDIR)/$(LP)ecereCOM$(SO).0")
-       $(call rmq,"$(DESTLIBDIR)/$(LP)ec$(SO).0")
-       $(call rmq,"$(DESTLIBDIR)/$(LP)EDA$(SO).0")
-       $(call rmq,"$(DESTLIBDIR)/$(LP)EDASQLite$(SO).0")
+       $(call rmq,"$(DESTLIBDIR)/ec/$(LP)ec$(SO).0")
+       $(call rmq,"$(DESTLIBDIR)/ec/$(LP)EDA$(SO).0")
+       $(call rmq,"$(DESTLIBDIR)/ec/$(LP)EDASQLite$(SO).0")
 ifdef EDASQLiteCipher
-       $(call rmq,"$(DESTLIBDIR)/$(LP)EDASQLiteCipher$(SO).0")
+       $(call rmq,"$(DESTLIBDIR)/ec/$(LP)EDASQLiteCipher$(SO).0")
 endif
-       $(call rmq,"$(DESTLIBDIR)/$(LP)EcereaAudio$(SO).0")
+       $(call rmq,"$(DESTLIBDIR)/ec/$(LP)EcereaAudio$(SO).0")
        $(call rmq,"$(DESTLIBDIR)/$(LP)ecere$(SOV)")
        $(call rmq,"$(DESTLIBDIR)/$(LP)ecereCOM$(SOV)")
-       $(call rmq,"$(DESTLIBDIR)/$(LP)ec$(SOV)")
-       $(call rmq,"$(DESTLIBDIR)/$(LP)EDA$(SOV)")
-       $(call rmq,"$(DESTLIBDIR)/$(LP)EDASQLite$(SOV)")
+       $(call rmq,"$(DESTLIBDIR)/ec/$(LP)ec$(SOV)")
+       $(call rmq,"$(DESTLIBDIR)/ec/$(LP)EDA$(SOV)")
+       $(call rmq,"$(DESTLIBDIR)/ec/$(LP)EDASQLite$(SOV)")
 ifdef EDASQLiteCipher
-       $(call rmq,"$(DESTLIBDIR)/$(LP)EDASQLiteCipher$(SOV)")
+       $(call rmq,"$(DESTLIBDIR)/ec/$(LP)EDASQLiteCipher$(SOV)")
 endif
-ifdef ECERE_AUDIO
-       $(call rmq,"$(DESTLIBDIR)/$(LP)EcereAudio$(SOV)")
+ifneq "$(ECERE_AUDIO)" "n"
+       $(call rmq,"$(DESTLIBDIR)/ec/$(LP)EcereAudio$(SOV)")
 endif
        $(call rmq,"$(DESTDIR)$(prefix)/share/pixmaps/ecere.png")
        $(call rmq,"$(DESTDIR)$(prefix)/share/applications/ecere.desktop")