diff options
Diffstat (limited to 'desktop/util/makefile.mk')
| -rw-r--r-- | desktop/util/makefile.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index b04162cf0ad1..05f129b3c5fc 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -78,6 +78,7 @@ RESLIB1IMAGES= $(PRJ)$/res RESLIB1SRSFILES= $(SRS)$/desktop.srs \ $(SRS)$/wizard.srs +.IF "$(L10N_framework)"=="" .IF "$(GUI)" != "OS2" APP1TARGET=so$/$(TARGET) APP1NOSAL=TRUE @@ -107,7 +108,6 @@ APP1STDLIBS = \ $(SAXLIB) \ $(FWILIB) \ $(ICUUCLIB) \ - $(SJLIB) \ $(I18NUTILLIB) \ $(ICULIB) \ $(JVMFWKLIB) \ @@ -121,7 +121,7 @@ APP1STDLIBS = \ .IF "$(GUI)" == "UNX" .IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" -APP1STDLIBS+= -lXext -lSM -lICE +APP1STDLIBS+= -lXext .ENDIF .ENDIF @@ -171,7 +171,6 @@ APP5STDLIBS = \ $(SAXLIB) \ $(FWILIB) \ $(ICUUCLIB) \ - $(SJLIB) \ $(I18NUTILLIB) \ $(ICULIB) \ $(JVMFWKLIB) \ @@ -183,7 +182,8 @@ APP5STDLIBS = \ $(VOSLIB) .IF "$(OS)" == "LINUX" -APP5STDLIBS+= -lXext -lSM -lICE +APP5STDLIBS+= -lXext +#APP5STDLIBS+= -lXext -lSM -lICE .ENDIF # LINUX APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc @@ -241,10 +241,14 @@ APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc APP5DEF= $(MISCX)$/$(TARGET).def .ENDIF # WNT +.ENDIF + # --- Targets ------------------------------------------------------------- .INCLUDE : target.mk +.IF "$(L10N_framework)"=="" + .IF "$(APP1TARGETN)"!="" $(APP1TARGETN) : $(MISC)$/binso_created.flg .ENDIF # "$(APP1TARGETN)"!="" @@ -333,3 +337,5 @@ $(BIN)$/$(TARGET).bin: $(BIN)$/$(TARGET)$(EXECPOST) $(MISC)$/binso_created.flg : @@-$(MKDIRHIER) $(BIN)$/so && $(TOUCH) $@ + +.ENDIF |