[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sc/source

Herbert Dürr hdu at apache.org
Mon Jan 6 10:09:58 PST 2014


 sc/source/filter/dif/makefile.mk      |    3 ++-
 sc/source/filter/excel/makefile.mk    |    3 ++-
 sc/source/filter/ftools/makefile.mk   |    3 ++-
 sc/source/filter/html/makefile.mk     |    3 ++-
 sc/source/filter/lotus/makefile.mk    |    3 ++-
 sc/source/filter/qpro/makefile.mk     |    4 ++--
 sc/source/filter/rtf/makefile.mk      |    3 ++-
 sc/source/filter/starcalc/makefile.mk |    3 ++-
 sc/source/filter/xcl97/makefile.mk    |    3 ++-
 sc/source/filter/xml/makefile.mk      |    3 ++-
 10 files changed, 20 insertions(+), 11 deletions(-)

New commits:
commit e8418b5adfbca524b7dcb72929fb35a120481fbf
Author: Herbert Dürr <hdu at apache.org>
Date:   Mon Jan 6 17:48:53 2014 +0000

    #i123964# fix SC build on windows with consistent symbol visibility

diff --git a/sc/source/filter/dif/makefile.mk b/sc/source/filter/dif/makefile.mk
index dc3b865..4add9b7 100644
--- a/sc/source/filter/dif/makefile.mk
+++ b/sc/source/filter/dif/makefile.mk
@@ -34,10 +34,11 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 
 # --- Settings -----------------------------------------------------
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/sc/source/filter/excel/makefile.mk b/sc/source/filter/excel/makefile.mk
index 280f865..0be1eea 100644
--- a/sc/source/filter/excel/makefile.mk
+++ b/sc/source/filter/excel/makefile.mk
@@ -34,10 +34,11 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 
 # --- Settings -----------------------------------------------------
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/sc/source/filter/ftools/makefile.mk b/sc/source/filter/ftools/makefile.mk
index 0ba8800..1bbe118 100644
--- a/sc/source/filter/ftools/makefile.mk
+++ b/sc/source/filter/ftools/makefile.mk
@@ -34,10 +34,11 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 
 # --- Settings -----------------------------------------------------
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/sc/source/filter/html/makefile.mk b/sc/source/filter/html/makefile.mk
index 657663d..93cd638 100644
--- a/sc/source/filter/html/makefile.mk
+++ b/sc/source/filter/html/makefile.mk
@@ -34,10 +34,11 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 
 # --- Settings -----------------------------------------------------
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/sc/source/filter/lotus/makefile.mk b/sc/source/filter/lotus/makefile.mk
index 4e66837..e72378b 100644
--- a/sc/source/filter/lotus/makefile.mk
+++ b/sc/source/filter/lotus/makefile.mk
@@ -34,10 +34,11 @@ AUTOSEG=true
 
 # --- Settings -----------------------------------------------------
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/sc/source/filter/qpro/makefile.mk b/sc/source/filter/qpro/makefile.mk
index ea52d0e..ebe2b77 100644
--- a/sc/source/filter/qpro/makefile.mk
+++ b/sc/source/filter/qpro/makefile.mk
@@ -32,13 +32,13 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 
 AUTOSEG=true
 
-
 # --- Settings -----------------------------------------------------
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/sc/source/filter/rtf/makefile.mk b/sc/source/filter/rtf/makefile.mk
index b6528bb..b2bd5a9 100644
--- a/sc/source/filter/rtf/makefile.mk
+++ b/sc/source/filter/rtf/makefile.mk
@@ -34,10 +34,11 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 
 # --- Settings -----------------------------------------------------
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/sc/source/filter/starcalc/makefile.mk b/sc/source/filter/starcalc/makefile.mk
index de29c19..873e13c 100644
--- a/sc/source/filter/starcalc/makefile.mk
+++ b/sc/source/filter/starcalc/makefile.mk
@@ -34,10 +34,11 @@ AUTOSEG=true
 
 # --- Settings -----------------------------------------------------
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/sc/source/filter/xcl97/makefile.mk b/sc/source/filter/xcl97/makefile.mk
index 5eaebfb..7320233 100644
--- a/sc/source/filter/xcl97/makefile.mk
+++ b/sc/source/filter/xcl97/makefile.mk
@@ -34,10 +34,11 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 
 # --- Settings -----------------------------------------------------
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :	scpre.mk
 .INCLUDE :	settings.mk
 .INCLUDE :	sc.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/sc/source/filter/xml/makefile.mk b/sc/source/filter/xml/makefile.mk
index afed4e6..bd26ee8 100644
--- a/sc/source/filter/xml/makefile.mk
+++ b/sc/source/filter/xml/makefile.mk
@@ -36,10 +36,11 @@ PROJECTPCHSOURCE=..\pch\filt_pch
 
 # --- Settings -----------------------------------------------------
 
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 .INCLUDE :  scpre.mk
 .INCLUDE :  settings.mk
 .INCLUDE :  sc.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 


More information about the Libreoffice-commits mailing list