diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 13:01:54 +0100 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-01-05 13:01:54 +0100 |
| commit | 2d8f81afc6407b248f435f895eb23cf843557fb1 (patch) | |
| tree | 9100ee31992063db88782c3fe09f45ed5a2cccd3 /odk | |
| parent | 93734378238f111aa55ad985ddd933684ee71010 (diff) | |
| parent | b1c385870a7d7c6a2c57b9d5ee9ef31203c2df0b (diff) | |
CWS-TOOLING: integrate CWS sb116
Notes
split repo tag: sdk_ooo/DEV300_m69
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/pack/gendocu/makefile.mk | 1 | ||||
| -rw-r--r-- | odk/source/unowinreg/win/makefile.mk | 2 | ||||
| -rw-r--r-- | odk/util/makefile.pmk | 6 |
3 files changed, 0 insertions, 9 deletions
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk index 5b070ca043f6..1970acebda7a 100644 --- a/odk/pack/gendocu/makefile.mk +++ b/odk/pack/gendocu/makefile.mk @@ -52,7 +52,6 @@ JAVA_PACKAGES=\ com.sun.star.comp.helper \ com.sun.star.lib.uno.helper \ com.sun.star.lib.unoloader \ - com.sun.star.tools.uno \ com.sun.star.uno \ $(JAVA_SRC_DIR)$/com$/sun$/star$/lib$/util$/UrlToFileMapper.java # com.sun.star.beans \ diff --git a/odk/source/unowinreg/win/makefile.mk b/odk/source/unowinreg/win/makefile.mk index 7c826ddb265c..2990c3b8d092 100644 --- a/odk/source/unowinreg/win/makefile.mk +++ b/odk/source/unowinreg/win/makefile.mk @@ -55,8 +55,6 @@ JAVA_INCLUDES+= -I$(JAVA_HOME)/include/bsd JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux .ELIF "$(OS)" == "NETBSD" JAVA_INCLUDES+= -I$(JAVA_HOME)/include/netbsd -.ELIF "$(OS)" == "IRIX" -JAVA_INCLUDES+= -I$(JAVA_HOME)/include/solaris .ENDIF .ENDIF diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index 57604f81b05c..33ff68c90ab1 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -162,12 +162,6 @@ DESTPLATFROM=netbsd ########### DESTPLATFROM=freebsd -.ELIF "$(OS)"=="IRIX" -########### -# IRIX -########### -DESTPLATFROM=irix - .ELIF "$(OS)"=="MACOSX" ########### # MACOSX |