X-Git-Url: https://ecere.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=10efdd28f1aee41e059442563d5297ef6e48f320;hb=21b92a4b426cc734ae44eeb8d4c64d095894d453;hp=e832899729a9db563ba4aed3b93e9e383448b2de;hpb=3fba754d4a5d1e10a4124d5811e1eb37f7e03174;p=sdk

diff --git a/Makefile b/Makefile
index e832899..10efdd2 100644
--- 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
 
@@ -44,8 +44,8 @@ SOV := $(SO)
 
 ifndef DESTDIR
 
-ifeq "$(TARGET_ARCH)" "x86_64"
-   ifneq "$(wildcard $(SystemDrive)/Program\ Files )" ""
+ifeq ($(TARGET_ARCH),x86_64)
+   ifneq ($(wildcard $(SystemDrive)/Program\ Files ),)
       export DESTDIR=$(SystemDrive)/Program Files/Ecere SDK
    else
       export DESTDIR=$(SystemDrive)/Ecere SDK
@@ -127,11 +127,11 @@ ifdef LIBDIR
 else
  export PREFIXLIBDIR=$(prefix)/lib/$(TARGET_ARCH)
 
- ifeq "$(wildcard $(prefix)/lib/$(TARGET_ARCH) )" ""
+ ifeq ($(wildcard $(prefix)/lib/$(TARGET_ARCH) ),)
   export PREFIXLIBDIR=$(prefix)/lib
 
-  ifeq "$(TARGET_ARCH)" "i386-linux-gnu"
-   ifneq "$(wildcard $(prefix)/lib32 )" ""
+  ifeq ($(TARGET_ARCH),i386-linux-gnu)
+   ifneq ($(wildcard $(prefix)/lib32 ),)
     export PREFIXLIBDIR=$(prefix)/lib32
    endif
   endif
@@ -304,7 +304,7 @@ epj2make: prepbinaries
 	cd epj2make && $(MAKE)
 
 ecereaudio: prepbinaries
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	@$(call echo,Building EcereAudio...)
 	cd audio && $(MAKE)
 endif
@@ -360,7 +360,7 @@ emptyoutput: outputdirs
 ifdef EDASQLiteCipher
 	$(call rmq,$(SODESTDIR)$(LP)EDASQLiteCipher$(SO))
 endif
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	$(call rmq,$(SODESTDIR)$(LP)EcereAudio$(SO))
 endif
 ifdef LINUX_TARGET
@@ -372,7 +372,7 @@ ifdef LINUX_TARGET
 ifdef EDASQLiteCipher
 	$(call rmq,$(SODESTDIR)$(LP)EDASQLiteCipher$(SO).0)
 endif
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	$(call rmq,$(SODESTDIR)$(LP)EcereAudio$(SO).0)
 endif
 	$(call rmq,$(SODESTDIR)$(LP)ecere$(SOV))
@@ -383,7 +383,7 @@ endif
 ifdef EDASQLiteCipher
 	$(call rmq,$(SODESTDIR)$(LP)EDASQLiteCipher$(SOV))
 endif
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	$(call rmq,$(SODESTDIR)$(LP)EcereAudio$(SOV))
 endif
 endif	
@@ -407,7 +407,7 @@ cleantarget:
 	cd epj2make && $(MAKE) cleantarget
 	cd ide && $(MAKE) cleantarget
 	cd installer && $(MAKE) cleantarget
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	cd audio && $(MAKE) cleantarget
 endif
 
@@ -436,7 +436,7 @@ endif
 	cd epj2make && $(MAKE) clean
 	cd ide && $(MAKE) clean
 	cd documentor && $(MAKE) clean
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	cd audio && $(MAKE) clean
 endif
 ifdef CodeGuard
@@ -455,7 +455,7 @@ endif
 	cd epj2make && $(MAKE) realclean
 	cd ide && $(MAKE) realclean
 	cd documentor && $(MAKE) realclean
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	cd audio && $(MAKE) realclean
 endif
 ifdef CodeGuard
@@ -475,7 +475,7 @@ endif
 	cd epj2make && $(MAKE) distclean
 	cd ide && $(MAKE) distclean
 	cd documentor && $(MAKE) distclean
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	cd audio && $(MAKE) distclean
 endif
 ifdef CodeGuard
@@ -502,7 +502,7 @@ 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)
 
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 BINARIES += audio/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EcereAudio$(SOV)
 endif
 
@@ -526,7 +526,7 @@ 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))
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	$(call cpq,audio/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EcereAudio$(SO),$(OBJBINDIR))
 endif
 ifdef EDASQLiteCipher
@@ -540,7 +540,7 @@ 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))
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	$(call cpq,audio/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EcereAudio$(SOV),$(OBJLIBDIR))
 endif
 ifdef EDASQLiteCipher
@@ -554,7 +554,7 @@ endif
 ifdef EDASQLiteCipher
 	ln -sf $(LP)EDASQLiteCipher$(SOV) $(OBJLIBDIR)$(LP)EDASQLiteCipher$(SO).0
 endif
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	ln -sf $(LP)EcereAudio$(SOV) $(OBJLIBDIR)$(LP)EcereAudio$(SO).0
 endif
 
@@ -576,7 +576,7 @@ 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))
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	$(call cpq,audio/obj/release.$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/$(LP)EcereAudio$(SO),$(OBJLIBDIR))
 endif
 ifdef EDASQLiteCipher
@@ -617,7 +617,7 @@ ifdef WINDOWS_TARGET
 ifdef EDASQLiteCipher
 	$(call cpq,$(OBJBINDIR)$(LP)EDASQLiteCipher$(SO),"$(DESTLIBDIR)/")
 endif
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	$(call cpq,$(OBJBINDIR)$(LP)EcereAudio$(SO),"$(DESTLIBDIR)/")
 endif
 	$(call cpq,$(OBJBINDIR)ide$(E),"$(BINDIR)/")
@@ -646,7 +646,7 @@ ifdef OSX_TARGET
 ifdef EDASQLiteCipher
 	install $(OBJLIBDIR)$(LP)EDASQLiteCipher$(SO) $(DESTLIBDIR)/
 endif
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	install $(OBJLIBDIR)$(LP)EcereAudio$(SO) $(DESTLIBDIR)/
 endif
 	install $(OBJBINDIR)ide$(E) $(BINDIR)/
@@ -686,7 +686,7 @@ ifdef LINUX_TARGET
 ifdef EDASQLiteCipher
 	install $(INSTALL_FLAGS) $(OBJLIBDIR)$(LP)EDASQLiteCipher$(SOV) $(DESTLIBDIR)/ec/$(LP)EDASQLiteCipher$(SOV)
 endif
-ifneq "$(ECERE_AUDIO)" "n"
+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
@@ -697,7 +697,7 @@ endif
 ifdef EDASQLiteCipher
 	ln -sf $(LP)EDASQLiteCipher$(SOV) $(DESTLIBDIR)/ec/$(LP)EDASQLiteCipher$(SO).0
 endif
-ifneq "$(ECERE_AUDIO)" "n"
+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)
@@ -710,7 +710,7 @@ endif
 ifdef EDASQLiteCipher
 	ln -sf $(LP)EDASQLiteCipher$(SOV) $(DESTLIBDIR)/ec/$(LP)EDASQLiteCipher$(SO)
 endif
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	ln -sf $(LP)EcereAudio$(SOV) $(DESTLIBDIR)/ec/$(LP)EcereAudio$(SO)
 endif
 ifndef BSD_HOST
@@ -783,7 +783,7 @@ ifdef LINUX_TARGET
 ifdef EDASQLiteCipher
 	$(call rmq,"$(DESTLIBDIR)/ec/$(LP)EDASQLiteCipher$(SO)")
 endif
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	$(call rmq,"$(DESTLIBDIR)/ec/$(LP)EcereAudio$(SO)")
 endif
 else
@@ -791,7 +791,7 @@ else
 ifdef EDASQLiteCipher
 	$(call rmq,"$(DESTLIBDIR)/$(LP)EDASQLiteCipher$(SO)")
 endif
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	$(call rmq,"$(DESTLIBDIR)/$(LP)EcereAudio$(SO)")
 endif
 endif
@@ -828,7 +828,7 @@ endif
 ifdef EDASQLiteCipher
 	$(call rmq,"$(DESTLIBDIR)/ec/$(LP)EDASQLiteCipher$(SOV)")
 endif
-ifneq "$(ECERE_AUDIO)" "n"
+ifneq ($(ECERE_AUDIO),n)
 	$(call rmq,"$(DESTLIBDIR)/ec/$(LP)EcereAudio$(SOV)")
 endif
 	$(call rmq,"$(DESTDIR)$(prefix)/share/pixmaps/ecere.png")