tarball,Makefiles; use _SDK_SRC_ROOT instead of misuses of _CF_DIR. _CF_DIR is for...

[sdk] / documentor / Makefile

diff --git a/documentor/Makefile b/documentor/Makefile
index 4b3bc60..18c5029 100644 (file)
--- a/documentor/Makefile
+++ b/documentor/Makefile
@@ -30,10 +30,10 @@ CONSOLE = -mwindows
 
 # INCLUDES
 
-_CF_DIR = ../
+_SDK_SRC_ROOT = ../
 
-include $(_CF_DIR)crossplatform.mk
-include $(_CF_DIR)default.cf
+include $(_SDK_SRC_ROOT)crossplatform.mk
+include $(_SDK_SRC_ROOT)default.cf
 
 # POST-INCLUDES VARIABLES
 
@@ -71,8 +71,10 @@ OBJECTS = $(ECOBJECTS) $(OBJ)$(MODULE).main$(O)
 SOURCES = $(ECSOURCES)
 
 RESOURCES = \
-       locale/zh_CN/LC_MESSAGES/documentor.mo \
-       locale/es_ES/LC_MESSAGES/documentor.mo \
+       locale/es.mo \
+       locale/pt_BR.mo \
+       locale/zh_CN.mo \
+       ../ide/res/actions/docOpen.png \
        res/documentorIcon.png
 
 LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
@@ -85,13 +87,10 @@ endif
 PRJ_CFLAGS += \
         $(if $(DEBUG), -g, -O2 -ffast-math) $(FPIC) -w
 
-
+ECFLAGS += -module $(MODULE)
 ECFLAGS += \
         -nolinenumbers
 
-
-
-
 CECFLAGS += -cpp $(_CPP)
 
 ifndef STATIC_LIBRARY_TARGET
@@ -105,7 +104,7 @@ endif
 all: objdir $(TARGET)
 
 objdir:
-       $(if $(wildcard $(OBJ)),,$(call mkdirq,$(OBJ)))
+       $(if $(wildcard $(OBJ)),,$(call mkdir,$(OBJ)))
 
 $(OBJ)$(MODULE).main.ec: $(SYMBOLS) $(COBJECTS)
        $(ECS) $(ARCH_FLAGS) $(ECSLIBOPT) $(SYMBOLS) $(IMPORTS) -symbols obj/$(CONFIG).$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX) -o $(OBJ)$(MODULE).main.ec
@@ -123,13 +122,12 @@ ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
 endif
        $(EAR) aw$(EARFLAGS) $(TARGET) res/documentorIcon.png ""
+       $(EAR) aw$(EARFLAGS) $(TARGET) locale/es.mo locale/pt_BR.mo locale/zh_CN.mo "locale"
        $(EAR) aw$(EARFLAGS) $(TARGET) ../ide/res/actions/docOpen.png "actions"
-       $(EAR) aw$(EARFLAGS) $(TARGET) locale/zh_CN/LC_MESSAGES/documentor.mo "locale/zh_CN/LC_MESSAGES"
-       $(EAR) aw$(EARFLAGS) $(TARGET) locale/es_ES/LC_MESSAGES/documentor.mo "locale/es_ES/LC_MESSAGES"
 else
        $(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
 endif
-       $(call cpq,$(TARGET),../obj/$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/bin/)
+       $(call cp,$(TARGET),../obj/$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/bin/)
 
 # SYMBOL RULES
 
@@ -222,19 +220,29 @@ $(OBJ)$(MODULE).main$(O): $(OBJ)$(MODULE).main.c
        $(CC) $(CFLAGS) $(PRJ_CFLAGS) $(FVISIBILITY) -c $(OBJ)$(MODULE).main.c -o $(OBJ)$(MODULE).main$(O)
 
 cleantarget: objdir
-       $(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 rm,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+       $(call rm,$(OBJ)$(LP)$(MODULE)$(SO))
+endif
+endif
+endif
 
 clean: cleantarget
-       $(call rmq,$(_OBJECTS))
-       $(call rmq,$(OBJ)$(MODULE).main.o $(OBJ)$(MODULE).main.c $(OBJ)$(MODULE).main.ec $(OBJ)$(MODULE).main$(I) $(OBJ)$(MODULE).main$(S))
-       $(call rmq,$(ECOBJECTS))
-       $(call rmq,$(COBJECTS))
-       $(call rmq,$(BOWLS))
-       $(call rmq,$(IMPORTS))
-       $(call rmq,$(SYMBOLS))
+       $(call rm,$(_OBJECTS))
+       $(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/)
+       $(call rmr,obj/)