Ecere Software / sdk / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
doc: Fixed newlines (specified by <BR> rather than \n)
[sdk] / installer / Makefile
diff --git a/installer/Makefile b/installer/Makefile
index b27e5b4..800a5c6 100644 (file)
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -42,7 +42,7 @@ OBJ = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/
 
 RES = 
 
-TARGET = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/setup-ecere-0.44.11-win32$(E)
+TARGET = obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/setup-ecere-0.44.14-win32$(E)
 
 _ECSOURCES = \
        src/installer.ec \
@@ -143,7 +143,7 @@ RESOURCES1 = \
 RESOURCES2 = \
        ../doc/EDA.eCdoc \
        ../LICENSE \
-       ../README \
+       ../README.md \
        ../doc/tao.pdf \
        coursework/Chapter\ 1\ -\ Getting\ Started/Lab1.1/helloWorld.ec \
        coursework/Chapter\ 1\ -\ Getting\ Started/Lab1.1/HelloWorld.epj \
@@ -5397,15 +5397,15 @@ endif
 all: objdir $(TARGET)
 
 objdir:
-       $(if $(wildcard $(OBJ)),,$(call mkdirq,$(OBJ)))
+       $(if $(wildcard $(OBJ)),,$(call mkdir,$(OBJ)))
        $(if $(ECERE_SDK_SRC),$(if $(wildcard $(call escspace,$(ECERE_SDK_SRC)/crossplatform.mk)),,@$(call echo,Ecere SDK Source Warning: The value of ECERE_SDK_SRC is pointing to an incorrect ($(ECERE_SDK_SRC)) location.)),)
        $(if $(ECERE_SDK_SRC),,$(if $(ECP_DEBUG)$(ECC_DEBUG)$(ECS_DEBUG),@$(call echo,ECC Debug Warning: Please define ECERE_SDK_SRC before using ECP_DEBUG, ECC_DEBUG or ECS_DEBUG),))
 
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
-       @$(call rmq,$(OBJ)symbols.lst)
+       @$(call rm,$(OBJ)symbols.lst)
        @$(call touch,$(OBJ)symbols.lst)
-       @$(call echo,$(SYMBOLS)) >> $(OBJ)symbols.lst
-       @$(call echo,$(IMPORTS)) >> $(OBJ)symbols.lst
+       $(call addtolistfile,$(SYMBOLS),$(OBJ)symbols.lst)
+       $(call addtolistfile,$(IMPORTS),$(OBJ)symbols.lst)
        $(ECS) $(ARCH_FLAGS) $(ECSLIBOPT) @$(OBJ)symbols.lst -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(call quote_path,$@)
 
 pots: $(OBJ)$(MODULE).main.ec  
@@ -5417,13 +5417,13 @@ $(OBJ)$(MODULE).main.c: $(OBJ)$(MODULE).main.ec
 $(SYMBOLS): | objdir
 $(OBJECTS): | objdir
 $(TARGET): $(SOURCES) $(RCSOURCES) $(RESOURCES) $(SYMBOLS) $(OBJECTS) | objdir
-       @$(call rmq,$(OBJ)objects.lst)
+       @$(call rm,$(OBJ)objects.lst)
        @$(call touch,$(OBJ)objects.lst)
 ifdef WINDOWS_TARGET
-       @$(call echo,$(RCOBJECTS)) >> $(OBJ)objects.lst
+       $(call addtolistfile,$(RCOBJECTS),$(OBJ)objects.lst)
 endif
-       @$(call echo,$(OBJ)$(MODULE).main$(O)) >> $(OBJ)objects.lst
-       @$(call echo,$(ECOBJECTS)) >> $(OBJ)objects.lst
+       $(call addtolistfile,$(OBJ)$(MODULE).main$(O),$(OBJ)objects.lst)
+       $(call addtolistfile,$(ECOBJECTS),$(OBJ)objects.lst)
 ifndef STATIC_LIBRARY_TARGET
        $(CC) $(OFLAGS) @$(OBJ)objects.lst $(LIBS) -o $(TARGET) $(INSTALLNAME)
 ifndef NOSTRIP
@@ -5442,7 +5442,7 @@ endif
        $(EAR) aw$(EARFLAGS) $(TARGET) ../obj/win32/bin/documentor.exe ../obj/win32/bin/ide.exe "ecere-sdk/ide"
        $(EAR) aw$(EARFLAGS) $(TARGET) ../obj/win32/bin/ear.exe ../obj/win32/bin/ec.dll ../obj/win32/bin/ecc.exe ../obj/win32/bin/ecereCOM.dll ../obj/win32/bin/ecp.exe ../obj/win32/bin/ecs.exe ../obj/win32/bin/epj2make.exe "ecere-sdk/compiler"
        $(EAR) aw$(EARFLAGS) $(TARGET) ../obj/win32/bin/EDA.dll ../obj/win32/bin/EDASQLite.dll "ecere-sdk/eda"
-       $(EAR) aw$(EARFLAGS) $(TARGET) ../doc/ecere.eCdoc ../doc/ecereCOM.eCdoc ../doc/EDA.eCdoc ../LICENSE ../README "ecere-sdk/doc"
+       $(EAR) aw$(EARFLAGS) $(TARGET) ../doc/ecere.eCdoc ../doc/ecereCOM.eCdoc ../doc/EDA.eCdoc ../LICENSE ../README.md "ecere-sdk/doc"
        $(EAR) aw$(EARFLAGS) $(TARGET) ../doc/tao.pdf "ecere-sdk/book"
        $(EAR) aw$(EARFLAGS) $(TARGET) coursework/Chapter\ 1\ -\ Getting\ Started/answers\ -\ chapter\ 1.odt coursework/Chapter\ 1\ -\ Getting\ Started/exercises\ -\ chapter\ 1.odt "ecere-sdk/coursework/Chapter 1 - Getting Started"
        $(EAR) aw$(EARFLAGS) $(TARGET) coursework/Chapter\ 1\ -\ Getting\ Started/Lab1.1/helloWorld.ec coursework/Chapter\ 1\ -\ Getting\ Started/Lab1.1/HelloWorld.epj "ecere-sdk/coursework/Chapter 1 - Getting Started/Lab1.1"
@@ -6210,32 +6210,36 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(call quote_path,$@)
 
 cleantarget: objdir
-       $(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
-       $(call rmq,$(OBJ)symbols.lst)
-       $(call rmq,$(OBJ)objects.lst)
-       $(call rmq,$(TARGET))
+       $(call rm,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
+       $(call rm,$(OBJ)symbols.lst)
+       $(call rm,$(OBJ)objects.lst)
+       $(call rm,$(TARGET))
 ifdef SHARED_LIBRARY_TARGET
 ifdef LINUX_TARGET
 ifdef LINUX_HOST
-       $(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
-       $(call rmq,$(OBJ)$(LP)$(MODULE)$(SO))
+       $(call rm,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+       $(call rm,$(OBJ)$(LP)$(MODULE)$(SO))
 endif
 endif
 endif
 
 clean: cleantarget
-       $(call rmq,$(_OBJECTS))
+       $(call rm,$(_OBJECTS))
 ifdef WINDOWS_TARGET
-       $(call rmq,$(_RCOBJECTS))
+       $(call rm,$(_RCOBJECTS))
 endif
-       $(call rmq,$(_ECOBJECTS))
-       $(call rmq,$(_COBJECTS))
-       $(call rmq,$(_BOWLS))
-       $(call rmq,$(_IMPORTS))
-       $(call rmq,$(_SYMBOLS))
+       $(call rm,$(_ECOBJECTS))
+       $(call rm,$(_COBJECTS))
+       $(call rm,$(_BOWLS))
+       $(call rm,$(_IMPORTS))
+       $(call rm,$(_SYMBOLS))
 
 realclean: cleantarget
-       $(call rmrq,$(OBJ))
+       $(call rmr,$(OBJ))
 
-distclean: cleantarget
-       $(call rmrq,obj/)
+distclean:
+       $(_MAKE) -f $(_CF_DIR)Cleanfile distclean distclean_all_subdirs
+
+Makefile: ;
+$(_CF_DIR)crossplatform.mk: ;
+$(_CF_DIR)default.cf: ;
The Ecere SDK