[Libreoffice-commits] .: Branch 'libreoffice-3-4' - binfilter/bf_so3

Fridrich Strba fridrich at kemper.freedesktop.org
Tue May 10 04:27:55 PDT 2011


 binfilter/bf_so3/source/data/makefile.mk    |    1 +
 binfilter/bf_so3/source/dialog/makefile.mk  |    1 +
 binfilter/bf_so3/source/inplace/makefile.mk |    1 +
 binfilter/bf_so3/source/ole/makefile.mk     |    1 +
 binfilter/bf_so3/source/persist/makefile.mk |    1 +
 binfilter/bf_so3/source/solink/makefile.mk  |    1 +
 binfilter/bf_so3/util/makefile.mk           |    1 +
 7 files changed, 7 insertions(+)

New commits:
commit 125c2b0109b0d4aeb5680fa36a0b341cc683eabd
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue May 10 13:16:44 2011 +0200

    Unbreak binfilter on Windows

diff --git a/binfilter/bf_so3/source/data/makefile.mk b/binfilter/bf_so3/source/data/makefile.mk
index 5f7e051..6139e7b 100644
--- a/binfilter/bf_so3/source/data/makefile.mk
+++ b/binfilter/bf_so3/source/data/makefile.mk
@@ -34,6 +34,7 @@ TARGET=so3_data
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
+.INCLUDE :  $(SUBPRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/binfilter/bf_so3/source/dialog/makefile.mk b/binfilter/bf_so3/source/dialog/makefile.mk
index 59f97c6..acafddd 100644
--- a/binfilter/bf_so3/source/dialog/makefile.mk
+++ b/binfilter/bf_so3/source/dialog/makefile.mk
@@ -35,6 +35,7 @@ TARGET=so3_dialog
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
+.INCLUDE :  $(SUBPRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/binfilter/bf_so3/source/inplace/makefile.mk b/binfilter/bf_so3/source/inplace/makefile.mk
index ed8bac7..b61242a 100644
--- a/binfilter/bf_so3/source/inplace/makefile.mk
+++ b/binfilter/bf_so3/source/inplace/makefile.mk
@@ -35,6 +35,7 @@ TARGET=so3_inplace
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
+.INCLUDE :  $(SUBPRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/binfilter/bf_so3/source/ole/makefile.mk b/binfilter/bf_so3/source/ole/makefile.mk
index aba536b..734e839 100644
--- a/binfilter/bf_so3/source/ole/makefile.mk
+++ b/binfilter/bf_so3/source/ole/makefile.mk
@@ -35,6 +35,7 @@ TARGET=so3_ole
 
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk
+.INCLUDE :  $(SUBPRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/binfilter/bf_so3/source/persist/makefile.mk b/binfilter/bf_so3/source/persist/makefile.mk
index be2b963..1fd0fae 100644
--- a/binfilter/bf_so3/source/persist/makefile.mk
+++ b/binfilter/bf_so3/source/persist/makefile.mk
@@ -38,6 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
+.INCLUDE :  $(SUBPRJ)$/util$/makefile.pmk
 
 .IF "$(NO_DLL)" == "NO_DLL"
 SLO=$(OBJ)
diff --git a/binfilter/bf_so3/source/solink/makefile.mk b/binfilter/bf_so3/source/solink/makefile.mk
index 71656cb..8a1350a 100644
--- a/binfilter/bf_so3/source/solink/makefile.mk
+++ b/binfilter/bf_so3/source/solink/makefile.mk
@@ -42,6 +42,7 @@ OPTLINKS=YES
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
+.INCLUDE :  $(SUBPRJ)$/util$/makefile.pmk
 
 # --- Files --------------------------------------------------------
 
diff --git a/binfilter/bf_so3/util/makefile.mk b/binfilter/bf_so3/util/makefile.mk
index fdfa39d..6967dd9 100644
--- a/binfilter/bf_so3/util/makefile.mk
+++ b/binfilter/bf_so3/util/makefile.mk
@@ -37,6 +37,7 @@ USE_LDUMP2=TRUE
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
+.INCLUDE :  $(SUBPRJ)$/util$/makefile.pmk
 
 RSCFLAGS+=-p
 


More information about the Libreoffice-commits mailing list