[Libreoffice-commits] .: Branch 'feature/gnumake2' - 5 commits - framework/Makefile sfx2/Makefile sfx2/source xmloff/Makefile

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Mon Dec 20 10:02:36 PST 2010 

 framework/Makefile                        |    4 ++--
 sfx2/Makefile                             |    4 ++--
 sfx2/source/appl/shutdownicon.cxx         |    2 +-
 sfx2/source/control/querystatus.cxx       |    2 +-
 sfx2/source/control/sfxstatuslistener.cxx |    2 +-
 xmloff/Makefile                           |    4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit e72c0f7c8381487c550c229fe41c28c2d1e17033
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Dec 20 11:43:53 2010 -0600

    fixing namespace collision

diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 85e366f..5d1858c 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -77,7 +77,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::ui::dialogs;
-using namespace ::rtl;
+using ::rtl::OUString;
 using namespace ::sfx2;
 
 #ifdef ENABLE_QUICKSTART_APPLET
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index 5b360af..ab3ceba 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/frame/status/ItemState.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
 
-using namespace ::rtl;
+using ::rtl::OUString;
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index 2812c2c..1614c4f 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -51,7 +51,7 @@
 #include <sfx2/unoctitm.hxx>
 #include <sfx2/msgpool.hxx>
 
-using namespace ::rtl;
+using ::rtl::OUString;
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
commit 7ec0184a40fa89e28ad31998f09884e92015c4a8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Dec 20 09:23:18 2010 -0600

    getting rid of obsolete install and uninstall targets

diff --git a/framework/prj/makefile.mk b/framework/prj/makefile.mk
index 4a86a6d..ab983d2 100644
--- a/framework/prj/makefile.mk
+++ b/framework/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk
index 4a86a6d..ab983d2 100644
--- a/sfx2/prj/makefile.mk
+++ b/sfx2/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
diff --git a/xmloff/prj/makefile.mk b/xmloff/prj/makefile.mk
index 4a86a6d..ab983d2 100644
--- a/xmloff/prj/makefile.mk
+++ b/xmloff/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
commit 44efff9b11f3d2f7c75311ec8d46aca05834c8c9
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Dec 20 07:40:08 2010 -0600

    updated license headers

diff --git a/framework/Makefile b/framework/Makefile
index 24d04e5..ff9d4f2 100644
--- a/framework/Makefile
+++ b/framework/Makefile
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
diff --git a/sfx2/Makefile b/sfx2/Makefile
index 24d04e5..ff9d4f2 100644
--- a/sfx2/Makefile
+++ b/sfx2/Makefile
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
diff --git a/xmloff/Makefile b/xmloff/Makefile
index 24d04e5..ff9d4f2 100644
--- a/xmloff/Makefile
+++ b/xmloff/Makefile
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
commit 8ec5199419ab1c44aeedce813983dc1614c53768
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Dec 20 05:52:40 2010 -0600

    fix naming for partial build vars

diff --git a/framework/Makefile b/framework/Makefile
index 828f0a8..24d04e5 100644
--- a/framework/Makefile
+++ b/framework/Makefile
@@ -29,8 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
 
-gb_PARTITIALBUILD := T
-include $(SOLARSRC)/SourcePath.mk
+gb_PARTIALBUILD := T
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
 
diff --git a/sfx2/Makefile b/sfx2/Makefile
index 828f0a8..24d04e5 100644
--- a/sfx2/Makefile
+++ b/sfx2/Makefile
@@ -29,8 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
 
-gb_PARTITIALBUILD := T
-include $(SOLARSRC)/SourcePath.mk
+gb_PARTIALBUILD := T
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
 
diff --git a/xmloff/Makefile b/xmloff/Makefile
index 828f0a8..24d04e5 100644
--- a/xmloff/Makefile
+++ b/xmloff/Makefile
@@ -29,8 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
 
-gb_PARTITIALBUILD := T
-include $(SOLARSRC)/SourcePath.mk
+gb_PARTIALBUILD := T
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
 
commit 47ce53a30851eb2b80f6c86178e3f0813b0c81ed
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Dec 20 04:42:38 2010 -0600

    first try at local build dirs

diff --git a/framework/Makefile b/framework/Makefile
index 9d5b8e7..828f0a8 100644
--- a/framework/Makefile
+++ b/framework/Makefile
@@ -29,6 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
 
+gb_PARTITIALBUILD := T
 include $(SOLARSRC)/SourcePath.mk
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
diff --git a/framework/prj/makefile.mk b/framework/prj/makefile.mk
index ab983d2..4a86a6d 100644
--- a/framework/prj/makefile.mk
+++ b/framework/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
diff --git a/sfx2/Makefile b/sfx2/Makefile
index 9d5b8e7..828f0a8 100644
--- a/sfx2/Makefile
+++ b/sfx2/Makefile
@@ -29,6 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
 
+gb_PARTITIALBUILD := T
 include $(SOLARSRC)/SourcePath.mk
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk
index ab983d2..4a86a6d 100644
--- a/sfx2/prj/makefile.mk
+++ b/sfx2/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install
diff --git a/xmloff/Makefile b/xmloff/Makefile
index 9d5b8e7..828f0a8 100644
--- a/xmloff/Makefile
+++ b/xmloff/Makefile
@@ -29,6 +29,7 @@ ifeq ($(strip $(SOLARENV)),)
 $(error No environment set!)
 endif
 
+gb_PARTITIALBUILD := T
 include $(SOLARSRC)/SourcePath.mk
 GBUILDDIR := $(SOLARENV)/gbuild
 include $(GBUILDDIR)/gbuild.mk
diff --git a/xmloff/prj/makefile.mk b/xmloff/prj/makefile.mk
index ab983d2..4a86a6d 100644
--- a/xmloff/prj/makefile.mk
+++ b/xmloff/prj/makefile.mk
@@ -37,4 +37,4 @@ VERBOSEFLAG := -s
 .ENDIF
 
 all:
-	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install

More information about the Libreoffice-commits mailing list