diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-18 11:54:06 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-18 11:54:06 +0000 |
| commit | 1afd62eb12424c9ada63aa9513e46c49dff9db62 (patch) | |
| tree | 97a790b2ad8f0c61a23d576bb6dabfbfe4da6523 /desktop/util | |
| parent | c7e172b2d9036c788fe00552ded841340d115033 (diff) | |
CWS-TOOLING: integrate CWS dtrans2vcl
2009-09-09 19:47:56 +0200 pl r276016 : merge fix for #i104390# into moved code
2009-09-07 12:50:47 +0200 pl r275891 : remove nonexistant header
2009-09-04 16:47:05 +0200 pl r275819 : forgot calling convention for Windoze
2009-09-04 13:27:36 +0200 pl r275800 : #150926# remove X11 dependency
2009-09-04 13:19:08 +0200 pl r275799 : #150926# move mac dtrans service to vcl to be used in service implementation
2009-09-03 21:19:01 +0200 pl r275774 : fix warning, adjust comment
2009-09-03 18:36:01 +0200 pl r275768 : no more sjlib
2009-09-03 17:56:49 +0200 pl r275767 : remove unused X11 link dependency
2009-09-03 17:43:35 +0200 pl r275766 : headless not used in X11 case
2009-09-03 17:34:36 +0200 pl r275765 : #150926# bye bye sj2
2009-09-03 16:19:04 +0200 pl r275761 : #150926# bye bye sj2, x11 dependenices removed where not necessary
2009-09-01 17:22:54 +0200 pl r275674 : #150926# step 1: move X11 code from dtrans to vcl, adapt glue code
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/makefile.mk | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 69b9c2254fe5..3712e49e983b 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -108,7 +108,6 @@ APP1STDLIBS = \ $(SAXLIB) \ $(FWILIB) \ $(ICUUCLIB) \ - $(SJLIB) \ $(I18NUTILLIB) \ $(ICULIB) \ $(JVMFWKLIB) \ @@ -120,11 +119,11 @@ APP1STDLIBS = \ $(VOSLIB) -.IF "$(GUI)" == "UNX" -.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" -APP1STDLIBS+= -lXext -lSM -lICE -.ENDIF -.ENDIF +#.IF "$(GUI)" == "UNX" +#.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" +#APP1STDLIBS+= -lXext -lSM -lICE +#.ENDIF +#.ENDIF APP1DEPN= $(APP1RES) verinfo.rc @@ -172,7 +171,6 @@ APP5STDLIBS = \ $(SAXLIB) \ $(FWILIB) \ $(ICUUCLIB) \ - $(SJLIB) \ $(I18NUTILLIB) \ $(ICULIB) \ $(JVMFWKLIB) \ @@ -183,9 +181,9 @@ APP5STDLIBS = \ $(SALHELPERLIB) \ $(VOSLIB) -.IF "$(OS)" == "LINUX" -APP5STDLIBS+= -lXext -lSM -lICE -.ENDIF # LINUX +#.IF "$(OS)" == "LINUX" +#APP5STDLIBS+= -lXext -lSM -lICE +#.ENDIF # LINUX APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc APP5DEF= $(MISCX)$/$(TARGET).def |