diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2006-05-24 13:36:26 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2006-05-24 13:36:26 +0000 |
commit | b947d704f9d707754bd8b90ed562b54117d43a76 (patch) | |
tree | fcbd9c02f6fe02e97a89b9f8aeacec27edf36ea1 | |
parent | 7cef21221663fc46d32ef07d0a4023c319784b6b (diff) |
INTEGRATION: CWS ause043 (1.23.12); FILE MERGED
2005/11/03 14:53:36 hjs 1.23.12.1: #i56702# remove overrides for default uno header generation
-rw-r--r-- | package/source/zippackage/makefile.mk | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/package/source/zippackage/makefile.mk b/package/source/zippackage/makefile.mk index 4f75be488..743b0ce82 100644 --- a/package/source/zippackage/makefile.mk +++ b/package/source/zippackage/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.23 $ +# $Revision: 1.24 $ # -# last change: $Author: rt $ $Date: 2005-09-08 16:20:29 $ +# last change: $Author: vg $ $Date: 2006-05-24 14:36:26 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -42,9 +42,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- -.INCLUDE : svpre.mk .INCLUDE : settings.mk -.INCLUDE : sv.mk # --- Files -------------------------------------------------------- # the following flag un-inlines function calls and disables optimisations @@ -64,19 +62,6 @@ SLOFILES= \ # $(SLO)$/InteractionRequest.obj \ # $(SLO)$/InteractionContinuation.obj -# --- UNO stuff --------------------------------------------------- - -CPPUMAKERFLAGS= -UNOUCROUT=$(OUT)$/inc -INCPRE+=$(UNOUCROUT) - -UNOTYPES=\ - com.sun.star.packages.manifest.XManifestReader \ - com.sun.star.packages.manifest.XManifestWriter \ - com.sun.star.packages.zip.ZipEntry \ - com.sun.star.packages.zip.ZipConstants \ - com.sun.star.packages.zip.ZipException - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk |