[Libreoffice-commits] .: 2 commits - connectivity/Library_calc.mk connectivity/Library_dbase.mk connectivity/Library_evoab.mk connectivity/Library_file.mk connectivity/Library_flat.mk connectivity/Library_jdbc.mk connectivity/Library_mozabdrv.mk connectivity/Library_mozbootstrap.mk connectivity/Library_odbcbase.mk connectivity/source

David Tardon dtardon at kemper.freedesktop.org
Wed May 30 05:14:11 PDT 2012 

 connectivity/Library_calc.mk                                             |    4 ----
 connectivity/Library_dbase.mk                                            |    4 ----
 connectivity/Library_evoab.mk                                            |    4 ----
 connectivity/Library_file.mk                                             |    4 ----
 connectivity/Library_flat.mk                                             |    4 ----
 connectivity/Library_jdbc.mk                                             |    4 ----
 connectivity/Library_mozabdrv.mk                                         |    2 --
 connectivity/Library_mozbootstrap.mk                                     |    2 +-
 connectivity/Library_odbcbase.mk                                         |    4 ----
 connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx                  |    8 ++++----
 connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx                  |    2 +-
 connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx              |    4 ++--
 connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx              |    4 ++--
 connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx |    4 ++--
 connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx    |    4 ++--
 15 files changed, 14 insertions(+), 44 deletions(-)

New commits:
commit f04a44c5e1f632aecfc92dde13783722070de6ae
Author: David Tardon <dtardon at redhat.com>
Date:   Wed May 30 14:13:42 2012 +0200

    remove unneeded (and wrong :-) dependencies
    
    Change-Id: I6e0f777c878137f6c1bcbe253b37b8eda257ef01

diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk
index 8ad6650..c9a83d1 100644
--- a/connectivity/Library_calc.mk
+++ b/connectivity/Library_calc.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,calc))
 
-$(eval $(call gb_Library_use_packages,calc,\
-	connectivity_generated \
-))
-
 $(eval $(call gb_Library_set_componentfile,calc,connectivity/source/drivers/calc/calc))
 
 $(eval $(call gb_Library_use_api,calc,\
diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk
index ef5402f..d26cc3b 100644
--- a/connectivity/Library_dbase.mk
+++ b/connectivity/Library_dbase.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,dbase))
 
-$(eval $(call gb_Library_use_packages,calc,\
-	connectivity_generated \
-))
-
 $(eval $(call gb_Library_set_componentfile,dbase,connectivity/source/drivers/dbase/dbase))
 
 $(eval $(call gb_Library_use_api,dbase,\
diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk
index 3f41de2..852685d 100644
--- a/connectivity/Library_evoab.mk
+++ b/connectivity/Library_evoab.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,evoab))
 
-$(eval $(call gb_Library_use_packages,calc,\
-	connectivity_generated \
-))
-
 $(eval $(call gb_Library_set_include,evoab,\
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \
diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk
index 72abb7c..b1757c1 100644
--- a/connectivity/Library_file.mk
+++ b/connectivity/Library_file.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,file))
 
-$(eval $(call gb_Library_use_packages,calc,\
-	connectivity_generated \
-))
-
 $(eval $(call gb_Library_add_defs,file,\
 	-DOOO_DLLIMPLEMENTATION_FILE \
 ))
diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk
index 02b1100..82885ce 100644
--- a/connectivity/Library_flat.mk
+++ b/connectivity/Library_flat.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,flat))
 
-$(eval $(call gb_Library_use_packages,calc,\
-	connectivity_generated \
-))
-
 $(eval $(call gb_Library_set_componentfile,flat,connectivity/source/drivers/flat/flat))
 
 $(eval $(call gb_Library_use_api,flat,\
diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk
index 04d4d39..470c19f 100644
--- a/connectivity/Library_jdbc.mk
+++ b/connectivity/Library_jdbc.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,jdbc))
 
-$(eval $(call gb_Library_use_packages,calc,\
-	connectivity_generated \
-))
-
 $(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc))
 
 $(eval $(call gb_Library_use_api,jdbc,\
diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk
index 8f34e6b..5336326 100644
--- a/connectivity/Library_odbcbase.mk
+++ b/connectivity/Library_odbcbase.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Library_Library,odbcbase))
 
 $(eval $(call gb_Library_set_warnings_not_errors,odbcbase))
 
-$(eval $(call gb_Library_use_packages,calc,\
-	connectivity_generated \
-))
-
 $(eval $(call gb_Library_use_api,odbcbase,\
 	offapi \
 	udkapi \
commit f3b3e7ab5f04d0598aa6c635b00aac1390d5f053
Author: David Tardon <dtardon at redhat.com>
Date:   Wed May 30 14:07:54 2012 +0200

    clean mozab includes, so two include paths can be dropped
    
    Change-Id: I824a6b6f6afa9e8c3d140e783dbad89ef5425878

diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk
index 5448487..14dd787 100644
--- a/connectivity/Library_mozabdrv.mk
+++ b/connectivity/Library_mozabdrv.mk
@@ -28,8 +28,6 @@
 $(eval $(call gb_Library_Library,mozabdrv))
 
 $(eval $(call gb_Library_set_include,mozabdrv,\
-	-I$(SRCDIR)/connectivity/source/drivers/mozab/bootstrap \
-	-I$(SRCDIR)/connectivity/source/drivers/mozab/mozillasrc \
 	-I$(SRCDIR)/connectivity/source/drivers/mozab \
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \
diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk
index 2a4793c..36c7486 100644
--- a/connectivity/Library_mozbootstrap.mk
+++ b/connectivity/Library_mozbootstrap.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Library_add_defs,mozbootstrap,\
 ))
 
 $(eval $(call gb_Library_set_include,mozbootstrap,\
-	-I$(SRCDIR)/connectivity/source/drivers/mozab/mozillasrc \
+	-I$(SRCDIR)/connectivity/source/drivers/mozab \
 	$$(INCLUDE) \
 ))
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index e9d8222..4ab8996 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -26,11 +26,11 @@
  *
  ************************************************************************/
 
-#include <MNSInclude.hxx>
+#include "mozillasrc/MNSInclude.hxx"
 
 #include "mozilla_nsinit.h"
 
-#include <MNSInit.hxx>
+#include "MNSInit.hxx"
 
 #include <sal/types.h>
 #include <osl/diagnose.h>
@@ -39,9 +39,9 @@
 #include <rtl/bootstrap.hxx>
 
 #include "MConfigAccess.hxx"
-#include "MNSDeclares.hxx"
+#include "mozillasrc/MNSDeclares.hxx"
 #include <osl/thread.hxx>
-#include <MNSTerminateListener.hxx>
+#include "mozillasrc/MNSTerminateListener.hxx"
 
 static nsIServiceManager*   sServiceManager = nsnull;
 static sal_Int32            sInitCounter = 0;
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
index 0ccd432..4908098 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
@@ -28,7 +28,7 @@
 
 #ifndef _CONNECTIVITY_MAB_NS_INIT_HXX_
 #define _CONNECTIVITY_MAB_NS_INIT_HXX_ 1
-#include "MNSDeclares.hxx"
+#include "mozillasrc/MNSDeclares.hxx"
 
 #include <sal/types.h>
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
index 8125ac3..c18ddab 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
@@ -27,8 +27,8 @@
  ************************************************************************/
 
 #include "MNSRunnable.hxx"
-#include "MDatabaseMetaDataHelper.hxx"
-#include "MQuery.hxx"
+#include "mozillasrc/MDatabaseMetaDataHelper.hxx"
+#include "mozillasrc/MQuery.hxx"
 #include <osl/mutex.hxx>
 #include <osl/conditn.hxx>
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
index 2f17ea5..2132276 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
@@ -28,10 +28,10 @@
 
 #ifndef _CONNECTIVITY_MAB_MOZAB_RUNNABLE_HXX_
 #define _CONNECTIVITY_MAB_MOZAB_RUNNABLE_HXX_
-#include "MNSDeclares.hxx"
+#include "mozillasrc/MNSDeclares.hxx"
 #include <osl/thread.hxx>
 
-#include <MNSInclude.hxx>
+#include "mozillasrc/MNSInclude.hxx"
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/mozilla/XCodeProxy.hpp>
 
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index ebee40a..7906d7a 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
@@ -28,7 +28,7 @@
 
 
 // Mozilla includes.
-#include <MNSInclude.hxx>
+#include "MNSInclude.hxx"
 
 #include "resource/mozab_res.hrc"
 #include "MDatabaseMetaDataHelper.hxx"
@@ -44,7 +44,7 @@
 #include <nsIAbDirFactoryService.h>
 #include "post_include_mozilla.h"
 
-#include <MNSInit.hxx>
+#include "bootstrap/MNSInit.hxx"
 #include <MNameMapper.hxx>
 #include "MNSMozabProxy.hxx"
 #include <MNSDeclares.hxx>
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
index 4e90797..d279c6b 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
@@ -26,10 +26,10 @@
  *
  ************************************************************************/
 
-#include <MNSTerminateListener.hxx>
+#include "MNSTerminateListener.hxx"
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/frame/XDesktop.hpp>
-#include <MNSInit.hxx>
+#include "bootstrap/MNSInit.hxx"
 
 
 using namespace ::com::sun::star::uno;

More information about the Libreoffice-commits mailing list