i18n: (#858) Fixed directory layout to really match what Launchpad expects

[sdk] / compiler / libec / Makefile

diff --git a/compiler/libec/Makefile b/compiler/libec/Makefile
index a3d3539..69105f5 100644 (file)
--- a/compiler/libec/Makefile
+++ b/compiler/libec/Makefile
@@ -100,9 +100,9 @@ SOURCES = $(ECSOURCES) \
        ../bootstrap/bsl.c
 
 RESOURCES = \
-       locale/ec-es.mo \
-       locale/ec-mr.mo \
-       locale/ec-zh_CN.mo
+       locale/ec/es.mo \
+       locale/ec/mr.mo \
+       locale/ec/zh_CN.mo
 
 LIBS += $(SHAREDLIB) $(EXECUTABLE) $(LINKOPT)
 
@@ -156,7 +156,7 @@ ifndef STATIC_LIBRARY_TARGET
 ifndef NOSTRIP
        $(STRIP) $(STRIPOPT) $(TARGET)
 endif
-       $(EAR) aw$(EARFLAGS) $(TARGET) locale/ec-es.mo locale/ec-mr.mo locale/ec-zh_CN.mo "locale"
+       $(EAR) aw$(EARFLAGS) $(TARGET) locale/ec/es.mo locale/ec/mr.mo locale/ec/zh_CN.mo "locale/ec"
 else
        $(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
 endif
@@ -393,11 +393,21 @@ $(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,$(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))
+ifdef SHARED_LIBRARY_TARGET
+ifdef LINUX_TARGET
+ifdef LINUX_HOST
+       $(call rmq,$(OBJ)$(LP)$(MODULE)$(SO)$(basename $(VER)))
+       $(call rmq,$(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))