[Libreoffice-commits] .: 2 commits - bridges/source cppuhelper/test jurt/demo jvmfwk/plugins pyuno/source registry/util remotebridges/source sal/inc sal/rtl sal/test stoc/test store/inc store/source store/workben unoil/climaker
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Tue Feb 1 09:22:54 PST 2011
bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk | 2 --
bridges/source/remote/context/makefile.mk | 2 --
cppuhelper/test/loader/makefile.mk | 7 -------
jurt/demo/com/sun/star/demo/makefile.mk | 2 +-
jvmfwk/plugins/sunmajor/pluginlib/makefile.mk | 9 ---------
pyuno/source/loader/makefile.mk | 10 ----------
registry/util/makefile.mk | 2 +-
remotebridges/source/factory/makefile.mk | 1 -
sal/inc/rtl/cipher.h | 2 +-
sal/inc/rtl/crc.h | 2 +-
sal/inc/rtl/digest.h | 2 +-
sal/inc/rtl/random.h | 2 +-
sal/rtl/source/cipher.c | 2 +-
sal/rtl/source/crc.c | 2 +-
sal/rtl/source/digest.c | 2 +-
sal/rtl/source/random.c | 2 +-
sal/test/makefile.mk | 6 ++++--
stoc/test/excomp/makefile.mk | 1 -
stoc/test/javavm/testapplet/makefile.mk | 9 +++------
stoc/test/javavm/testcomponent/makefile.mk | 10 +++-------
store/inc/store/store.h | 2 +-
store/inc/store/types.h | 2 +-
store/source/lockbyte.hxx | 2 +-
store/source/object.hxx | 2 +-
store/source/storbase.hxx | 2 +-
store/source/storcach.hxx | 2 +-
store/source/stordir.hxx | 2 +-
store/source/storlckb.hxx | 2 +-
store/source/storpage.hxx | 2 +-
store/source/stortree.hxx | 2 +-
store/workben/t_store.cxx | 2 +-
unoil/climaker/makefile.mk | 1 -
32 files changed, 31 insertions(+), 69 deletions(-)
New commits:
commit 6d0f5c32d0a1c03e29b00cb3c40ce02eb7193f38
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 1 18:07:04 2011 +0100
Clean up makefiles
diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk b/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk
index 2af2f29..74d156a 100644
--- a/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk
+++ b/bridges/source/cpp_uno/cc50_solaris_sparc/makefile.mk
@@ -44,8 +44,6 @@ CHECKFORPIC=
.IF "$(COM)" == "C52" && "$(CPU)"=="S"
-#CFLAGS += -O5 -xO5
-
.IF "$(cppu_no_leak)" == ""
CFLAGS += -DLEAK_STATIC_DATA
.ENDIF
diff --git a/bridges/source/remote/context/makefile.mk b/bridges/source/remote/context/makefile.mk
index cc2a523..a192f81 100644
--- a/bridges/source/remote/context/makefile.mk
+++ b/bridges/source/remote/context/makefile.mk
@@ -57,8 +57,6 @@ SHL1RPATH=URELIB
SHL1VERSIONMAP= $(TARGET).map
DEF1NAME= $(SHL1TARGET)
-#DEF1EXPORTFILE= exports.dxp
-
# --- Targets ------------------------------------------------------
diff --git a/cppuhelper/test/loader/makefile.mk b/cppuhelper/test/loader/makefile.mk
index dc1b566..4816dcb 100644
--- a/cppuhelper/test/loader/makefile.mk
+++ b/cppuhelper/test/loader/makefile.mk
@@ -34,15 +34,8 @@ ENABLE_EXCEPTIONS := TRUE
NO_BSYMBOLIC := TRUE
USE_DEFFILE := TRUE
-
.INCLUDE : settings.mk
-
-.IF "$(COM)" == "GCC"
-#LINKFLAGS += -rdynamic
-.ENDIF
-
-
ENVINCPRE := -I$(OUT)$/inc$/$(TARGET)
APP1TARGET := $(TARGET)
diff --git a/jurt/demo/com/sun/star/demo/makefile.mk b/jurt/demo/com/sun/star/demo/makefile.mk
index 6bc3e1a..c009a2a 100644
--- a/jurt/demo/com/sun/star/demo/makefile.mk
+++ b/jurt/demo/com/sun/star/demo/makefile.mk
@@ -34,6 +34,7 @@ TARGET := com_sun_star_demo
RDB=$(SOLARBINDIR)$/applicat.rdb
# --- Settings -----------------------------------------------------
+
.INCLUDE : settings.mk
#Files --------------------------------------------------------
@@ -53,5 +54,4 @@ JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFI
# --- Targets ------------------------------------------------------
-
.INCLUDE : target.mk
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
index 25ff106..4fdb1ba 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
+++ b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
@@ -27,13 +27,9 @@
PRJ=..$/..$/..
PRJNAME= jvmfwk
-
TARGET = plugin
-
ENABLE_EXCEPTIONS=TRUE
-
LIBTARGET=NO
-
UNOCOMPONENT1=sunjavaplugin
# --- Settings -----------------------------------------------------
@@ -43,7 +39,6 @@ DLLPRE =
# ------------------------------------------------------------------
-#.INCLUDE : ..$/cppumaker.mk
.IF "$(SOLAR_JAVA)"!=""
SLOFILES= \
@@ -58,8 +53,6 @@ SLOFILES= \
LIB1OBJFILES= $(SLOFILES)
-
-
LIB1TARGET=$(SLB)$/$(UNOCOMPONENT1).lib
SHL1TARGET= $(UNOCOMPONENT1)
@@ -95,8 +88,6 @@ JAVAFILES = $(subst,$(CLASSDIR)$/, $(subst,.class,.java $(JAVACLASSFILES)))
.ENDIF # SOLAR_JAVA
-
-
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk
index 6f8648c..c706a77 100644
--- a/pyuno/source/loader/makefile.mk
+++ b/pyuno/source/loader/makefile.mk
@@ -73,16 +73,6 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
SLOFILES= $(SLO)$/pyuno_loader.obj
-#COMPONENTS= \
-# tcv \
-# inv \
-# corefl \
-# insp \
-# invadp \
-# proxyfac \
-# pythonloader.uno \
-
-
COMPONENTS= \
stocservices.uno \
invocation.uno \
diff --git a/registry/util/makefile.mk b/registry/util/makefile.mk
index 1fb4cdc..0b6be7e 100644
--- a/registry/util/makefile.mk
+++ b/registry/util/makefile.mk
@@ -33,12 +33,12 @@ TARGET=reg
UNIXVERSIONNAMES=UDK
# --- Settings -----------------------------------------------------
+
.INCLUDE : settings.mk
# ------------------------------------------------------------------
USE_LDUMP2=TRUE
-#USE_DEFFILE=TRUE
LDUMP2=LDUMP3
DOCPPFILES= $(INC)$/registry$/registry.hxx \
diff --git a/remotebridges/source/factory/makefile.mk b/remotebridges/source/factory/makefile.mk
index 7cd3875..11e19e1 100644
--- a/remotebridges/source/factory/makefile.mk
+++ b/remotebridges/source/factory/makefile.mk
@@ -51,7 +51,6 @@ SHL1STDLIBS= \
$(CPPUHELPERLIB) \
$(RMCXTLIB)
-#SHL1DEPN=
SHL1IMPLIB= i$(TARGET)
SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/test/makefile.mk b/sal/test/makefile.mk
index 6edba90..1f4b339 100644
--- a/sal/test/makefile.mk
+++ b/sal/test/makefile.mk
@@ -33,13 +33,13 @@ TARGETTYPE=CUI
LIBTARGET=NO
USE_LDUMP2=TRUE
ENABLE_EXCEPTIONS=TRUE
-#LDUMP2=LDUMP3
-
# --- Settings -----------------------------------------------------
+
.INCLUDE : settings.mk
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
+
# ------------------------------------------------------------------
.IF "$(GUI)"=="WNT"
@@ -70,6 +70,7 @@ APP4STDLIBS = $(SALLIB)
# --- Targets ------------------------------------------------------
+
.IF "$(depend)" == ""
ALL : ALLTAR \
$(BIN)$/$(BOOTSTRAPSCRIPT) \
@@ -144,6 +145,7 @@ $(BIN)$/bootstraptest.ini : bootstraptest.ini
# --- SO2-Filter-Datei ---
+
$(MISC)$/tsl$(DLLPOSTFIX).flt:
@echo ------------------------------
@echo Making: $@
diff --git a/stoc/test/excomp/makefile.mk b/stoc/test/excomp/makefile.mk
index b41acb3..01ffb65 100644
--- a/stoc/test/excomp/makefile.mk
+++ b/stoc/test/excomp/makefile.mk
@@ -31,7 +31,6 @@ TARGET= excomp
TARGET1= excomp1
TARGET2= excomp2
TARGETTYPE=CUI
-#LIBTARGET=NO
ENABLE_EXCEPTIONS=TRUE
USE_DEFFILE= TRUE
NO_BSYMBOLIC= TRUE
diff --git a/stoc/test/javavm/testapplet/makefile.mk b/stoc/test/javavm/testapplet/makefile.mk
index 4ddadeb..31872c5 100644
--- a/stoc/test/javavm/testapplet/makefile.mk
+++ b/stoc/test/javavm/testapplet/makefile.mk
@@ -31,11 +31,12 @@ PRJNAME = testapplet
PACKAGE =
TARGET = TestApplet
-
# --- Settings -----------------------------------------------------
-#.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
.INCLUDE : settings.mk
+
# Files --------------------------------------------------------
+
JARFILES = ridl.jar jurt.jar unoil.jar
JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
@@ -45,11 +46,7 @@ JAVACLASSFILES= \
$(CLASSDIR)$/$(PACKAGE)$/TestApplet.class
JARCLASSDIRS= .
-#JARTARGET = $(TARGET).jar
-#JARCOMPRESS= TRUE
-#CUSTOMMANIFESTFILE= .$/manifest
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-
diff --git a/stoc/test/javavm/testcomponent/makefile.mk b/stoc/test/javavm/testcomponent/makefile.mk
index a2f8eb1..9d77ebf 100644
--- a/stoc/test/javavm/testcomponent/makefile.mk
+++ b/stoc/test/javavm/testcomponent/makefile.mk
@@ -31,11 +31,12 @@ PRJNAME = testcomponent
PACKAGE =
TARGET = JavaTestComponent
-
# --- Settings -----------------------------------------------------
-#.INCLUDE : $(PRJ)$/util$/makefile.pmk
+
.INCLUDE : settings.mk
+
# Files --------------------------------------------------------
+
JARFILES = ridl.jar jurt.jar unoil.jar
CUSTOMMANIFESTFILE= manifest
@@ -48,11 +49,6 @@ JAVAFILES= \
JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-
-
-
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
-
diff --git a/unoil/climaker/makefile.mk b/unoil/climaker/makefile.mk
index 36de0bf..d820e72 100644
--- a/unoil/climaker/makefile.mk
+++ b/unoil/climaker/makefile.mk
@@ -34,7 +34,6 @@ TARGET = unotypes
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/util$/makefile.pmk
-#.INCLUDE : $(PRJ)$/util$/target.pmk
.INCLUDE : target.mk
.INCLUDE : version.txt
commit 96cbf81e6fc78a9758170c480031f17d1e86f33e
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Jan 31 21:56:58 2011 +0100
Remove RCS information
diff --git a/sal/inc/rtl/cipher.h b/sal/inc/rtl/cipher.h
index 2c22977..5c64884 100644
--- a/sal/inc/rtl/cipher.h
+++ b/sal/inc/rtl/cipher.h
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef _RTL_CIPHER_H_
-#define _RTL_CIPHER_H_ "$Revision: 1.7 $"
+#define _RTL_CIPHER_H_
#include <sal/types.h>
diff --git a/sal/inc/rtl/crc.h b/sal/inc/rtl/crc.h
index 1bc0aa7..97e4bbc 100644
--- a/sal/inc/rtl/crc.h
+++ b/sal/inc/rtl/crc.h
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef _RTL_CRC_H_
-#define _RTL_CRC_H_ "$Revision: 1.4 $"
+#define _RTL_CRC_H_
#include <sal/types.h>
diff --git a/sal/inc/rtl/digest.h b/sal/inc/rtl/digest.h
index c59589c..e627639 100644
--- a/sal/inc/rtl/digest.h
+++ b/sal/inc/rtl/digest.h
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef _RTL_DIGEST_H_
-#define _RTL_DIGEST_H_ "$Revision: 1.8 $"
+#define _RTL_DIGEST_H_
#include <sal/types.h>
diff --git a/sal/inc/rtl/random.h b/sal/inc/rtl/random.h
index 2993200..f96196c 100644
--- a/sal/inc/rtl/random.h
+++ b/sal/inc/rtl/random.h
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef _RTL_RANDOM_H_
-#define _RTL_RANDOM_H_ "$Revision: 1.7 $"
+#define _RTL_RANDOM_H_
#include <sal/types.h>
diff --git a/sal/rtl/source/cipher.c b/sal/rtl/source/cipher.c
index 4c1e60d..1b750b0 100644
--- a/sal/rtl/source/cipher.c
+++ b/sal/rtl/source/cipher.c
@@ -26,7 +26,7 @@
*
************************************************************************/
-#define _RTL_CIPHER_C_ "$Revision: 1.5 $"
+#define _RTL_CIPHER_C_
#include <sal/types.h>
#include <rtl/alloc.h>
diff --git a/sal/rtl/source/crc.c b/sal/rtl/source/crc.c
index d8a8db0..03e72de 100644
--- a/sal/rtl/source/crc.c
+++ b/sal/rtl/source/crc.c
@@ -26,7 +26,7 @@
*
************************************************************************/
-#define _RTL_CRC_C_ "$Revision: 1.3 $"
+#define _RTL_CRC_C_
#include <sal/types.h>
#include <rtl/crc.h>
diff --git a/sal/rtl/source/digest.c b/sal/rtl/source/digest.c
index 5ee0210..1d43fc8 100644
--- a/sal/rtl/source/digest.c
+++ b/sal/rtl/source/digest.c
@@ -26,7 +26,7 @@
*
************************************************************************/
-#define _RTL_DIGEST_C_ "$Revision: 1.9 $"
+#define _RTL_DIGEST_C_
#include <sal/types.h>
#include <sal/macros.h>
diff --git a/sal/rtl/source/random.c b/sal/rtl/source/random.c
index fda2e74..4bdf882 100644
--- a/sal/rtl/source/random.c
+++ b/sal/rtl/source/random.c
@@ -26,7 +26,7 @@
*
************************************************************************/
-#define _RTL_RANDOM_C_ "$Revision: 1.6 $"
+#define _RTL_RANDOM_C_
#include <sal/types.h>
#include <osl/thread.h>
diff --git a/store/inc/store/store.h b/store/inc/store/store.h
index 6f4b544..1700395 100644
--- a/store/inc/store/store.h
+++ b/store/inc/store/store.h
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef _STORE_STORE_H_
-#define _STORE_STORE_H_ "$Revision: 1.6 $"
+#define _STORE_STORE_H_
#include <store/types.h>
diff --git a/store/inc/store/types.h b/store/inc/store/types.h
index dd67cc5..970dba2 100644
--- a/store/inc/store/types.h
+++ b/store/inc/store/types.h
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef _STORE_TYPES_H_
-#define _STORE_TYPES_H_ "$Revision: 1.8 $"
+#define _STORE_TYPES_H_
#include <sal/types.h>
#include <rtl/ustring.h>
diff --git a/store/source/lockbyte.hxx b/store/source/lockbyte.hxx
index f41dbae..13d3086 100644
--- a/store/source/lockbyte.hxx
+++ b/store/source/lockbyte.hxx
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef _STORE_LOCKBYTE_HXX_
-#define _STORE_LOCKBYTE_HXX_ "$Revision: 1.1.2.1 $"
+#define _STORE_LOCKBYTE_HXX_
#include "sal/types.h"
diff --git a/store/source/object.hxx b/store/source/object.hxx
index 0d71ffa..0ed06be 100644
--- a/store/source/object.hxx
+++ b/store/source/object.hxx
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef _STORE_OBJECT_HXX_
-#define _STORE_OBJECT_HXX_ "$Revision: 1.1.2.1 $"
+#define _STORE_OBJECT_HXX_
#include "sal/types.h"
diff --git a/store/source/storbase.hxx b/store/source/storbase.hxx
index c937ab9..f97f4b1 100644
--- a/store/source/storbase.hxx
+++ b/store/source/storbase.hxx
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef _STORE_STORBASE_HXX_
-#define _STORE_STORBASE_HXX_ "$Revision: 1.10.8.4 $"
+#define _STORE_STORBASE_HXX_
#include "sal/types.h"
diff --git a/store/source/storcach.hxx b/store/source/storcach.hxx
index feee209..4501e9a 100644
--- a/store/source/storcach.hxx
+++ b/store/source/storcach.hxx
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef _STORE_STORCACH_HXX
-#define _STORE_STORCACH_HXX "$Revision: 1.6.8.2 $"
+#define _STORE_STORCACH_HXX
#include "sal/types.h"
#include "rtl/ref.hxx"
diff --git a/store/source/stordir.hxx b/store/source/stordir.hxx
index b4903e3..883519e 100644
--- a/store/source/stordir.hxx
+++ b/store/source/stordir.hxx
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef _STORE_STORDIR_HXX_
-#define _STORE_STORDIR_HXX_ "$Revision: 1.1.2.2 $"
+#define _STORE_STORDIR_HXX_
#include <sal/types.h>
diff --git a/store/source/storlckb.hxx b/store/source/storlckb.hxx
index e44d87b..3f7c057 100644
--- a/store/source/storlckb.hxx
+++ b/store/source/storlckb.hxx
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef _STORE_STORLCKB_HXX_
-#define _STORE_STORLCKB_HXX_ "$Revision: 1.6.8.1 $"
+#define _STORE_STORLCKB_HXX_
#include "sal/types.h"
diff --git a/store/source/storpage.hxx b/store/source/storpage.hxx
index 1d7743a..9b54e36 100644
--- a/store/source/storpage.hxx
+++ b/store/source/storpage.hxx
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef _STORE_STORPAGE_HXX_
-#define _STORE_STORPAGE_HXX_ "$Revision: 1.6.8.2 $"
+#define _STORE_STORPAGE_HXX_
#include "sal/types.h"
diff --git a/store/source/stortree.hxx b/store/source/stortree.hxx
index 4152a5b..948510d 100644
--- a/store/source/stortree.hxx
+++ b/store/source/stortree.hxx
@@ -27,7 +27,7 @@
************************************************************************/
#ifndef _STORE_STORTREE_HXX
-#define _STORE_STORTREE_HXX "$Revision: 1.6.8.2 $"
+#define _STORE_STORTREE_HXX
#include "sal/types.h"
diff --git a/store/workben/t_store.cxx b/store/workben/t_store.cxx
index 3e863be..a13da11 100644
--- a/store/workben/t_store.cxx
+++ b/store/workben/t_store.cxx
@@ -29,7 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_store.hxx"
-#define _T_STORE_CXX "$Revision: 1.7.8.2 $"
+#define _T_STORE_CXX
#include <sal/types.h>
#include <osl/diagnose.h>
#include <osl/thread.h>
More information about the Libreoffice-commits
mailing list