[Libreoffice-commits] .: 2 commits - basic/source

Thomas Klausner tklausner at kemper.freedesktop.org
Thu Oct 21 07:36:19 PDT 2010


 basic/source/app/makefile.mk    |   54 +++++++++++-----------------------------
 basic/source/comp/makefile.mk   |   19 +++++---------
 basic/source/sample/makefile.mk |    3 ++
 basic/source/sbx/makefile.mk    |   51 +++++++++++++++++++------------------
 4 files changed, 52 insertions(+), 75 deletions(-)

New commits:
commit 361e29193bf8268ab76dc6e8aca4109260717085
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Thu Oct 21 16:35:12 2010 +0200

    Add more files to EXCEPTIONSFILES, needed at least on NetBSD.

diff --git a/basic/source/comp/makefile.mk b/basic/source/comp/makefile.mk
index d65f6a4..5fe64ce 100644
--- a/basic/source/comp/makefile.mk
+++ b/basic/source/comp/makefile.mk
@@ -35,25 +35,22 @@ TARGET=comp
 .INCLUDE :  settings.mk
 
 SLOFILES= \
-    $(SLO)$/buffer.obj      \
-    $(SLO)$/codegen.obj		\
-    $(SLO)$/dim.obj			\
+    $(EXCEPTIONSFILES)		\
+    $(SLO)$/buffer.obj		\
     $(SLO)$/exprgen.obj		\
     $(SLO)$/exprnode.obj	\
-    $(SLO)$/exprtree.obj	\
-    $(SLO)$/io.obj			\
+    $(SLO)$/io.obj		\
     $(SLO)$/loops.obj		\
-    $(SLO)$/parser.obj		\
     $(SLO)$/sbcomp.obj		\
-    $(SLO)$/scanner.obj		\
     $(SLO)$/symtbl.obj		\
     $(SLO)$/token.obj
 
 EXCEPTIONSFILES= \
-    $(SLO)$/codegen.obj     \
-    $(SLO)$/dim.obj         \
-    $(SLO)$/exprtree.obj    \
-    $(SLO)$/parser.obj
+    $(SLO)$/codegen.obj		\
+    $(SLO)$/dim.obj		\
+    $(SLO)$/exprtree.obj	\
+    $(SLO)$/parser.obj		\
+    $(SLO)$/scanner.obj
 
 # --- Targets --------------------------------------------------------------
 
diff --git a/basic/source/sample/makefile.mk b/basic/source/sample/makefile.mk
index 9aeb8e3..5261f13 100644
--- a/basic/source/sample/makefile.mk
+++ b/basic/source/sample/makefile.mk
@@ -40,6 +40,9 @@ CXXFILES = \
     object.cxx 		\
     collelem.cxx
 
+EXCEPTIONSFILES= \
+    $(OBJ)$/object.obj 	\
+    $(OBJ)$/collelem.obj
 
 OBJFILES = \
     $(OBJ)$/object.obj 	\
diff --git a/basic/source/sbx/makefile.mk b/basic/source/sbx/makefile.mk
index dfd8e72..cc20080 100644
--- a/basic/source/sbx/makefile.mk
+++ b/basic/source/sbx/makefile.mk
@@ -41,34 +41,35 @@ SRS1NAME=$(TARGET)
 SRC1FILES=	format.src
 
 SLOFILES=	\
-    $(SLO)$/sbxbase.obj	\
-    $(SLO)$/sbxres.obj  	\
-    $(SLO)$/sbxvalue.obj	\
-    $(SLO)$/sbxvals.obj	\
-    $(SLO)$/sbxvar.obj  	\
-    $(SLO)$/sbxarray.obj	\
-    $(SLO)$/sbxobj.obj	\
-    $(SLO)$/sbxcoll.obj	\
-    $(SLO)$/sbxexec.obj	\
-    $(SLO)$/sbxint.obj 	\
-    $(SLO)$/sbxlng.obj 	\
-    $(SLO)$/sbxsng.obj 	\
-    $(SLO)$/sbxmstrm.obj	\
-    $(SLO)$/sbxdbl.obj 	\
+    $(EXCEPTIONSFILES)	\
+    $(SLO)$/sbxbase.obj		\
+    $(SLO)$/sbxbool.obj		\
+    $(SLO)$/sbxbyte.obj		\
+    $(SLO)$/sbxchar.obj		\
+    $(SLO)$/sbxcoll.obj		\
     $(SLO)$/sbxcurr.obj 	\
-    $(SLO)$/sbxdate.obj	\
-    $(SLO)$/sbxstr.obj 	\
-    $(SLO)$/sbxbool.obj	\
-    $(SLO)$/sbxchar.obj	\
-    $(SLO)$/sbxbyte.obj	\
-    $(SLO)$/sbxuint.obj	\
-    $(SLO)$/sbxulng.obj	\
-    $(SLO)$/sbxform.obj	\
-    $(SLO)$/sbxscan.obj 	\
-    $(SLO)$/sbxdec.obj
+    $(SLO)$/sbxdec.obj		\
+    $(SLO)$/sbxform.obj		\
+    $(SLO)$/sbxint.obj 		\
+    $(SLO)$/sbxlng.obj 		\
+    $(SLO)$/sbxmstrm.obj	\
+    $(SLO)$/sbxobj.obj		\
+    $(SLO)$/sbxres.obj  	\
+    $(SLO)$/sbxsng.obj 		\
+    $(SLO)$/sbxuint.obj		\
+    $(SLO)$/sbxulng.obj		\
+    $(SLO)$/sbxvals.obj		\
+    $(SLO)$/sbxvar.obj
 
 
-EXCEPTIONSFILES=$(SLO)$/sbxarray.obj
+EXCEPTIONSFILES=	\
+    $(SLO)$/sbxarray.obj	\
+    $(SLO)$/sbxdate.obj		\
+    $(SLO)$/sbxdbl.obj 		\
+    $(SLO)$/sbxexec.obj		\
+    $(SLO)$/sbxscan.obj 	\
+    $(SLO)$/sbxstr.obj 		\
+    $(SLO)$/sbxvalue.obj	\
 
 # --- Targets -------------------------------------------------------------
 
commit 2187ebb990d35769dc986da3895ca95c18eb9fb8
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Thu Oct 21 16:33:49 2010 +0200

    Add more files to EXCEPTIONSFILES, needed at least on NetBSD.
    
    Remove OBJFILES, which serves no purpose (LIB1OBJFILES is
    the variable name used). Suggested by Caolán McNamara
    <caolanm at redhat.com>.

diff --git a/basic/source/app/makefile.mk b/basic/source/app/makefile.mk
index 07ceed6..e62b11c 100644
--- a/basic/source/app/makefile.mk
+++ b/basic/source/app/makefile.mk
@@ -38,32 +38,21 @@ LIBTARGET = NO
 
 # --- Common ------------------------------------------------------------
 
-OBJFILES = \
-    $(OBJ)$/ttbasic.obj	\
-    $(OBJ)$/basicrt.obj	\
-    $(OBJ)$/processw.obj    \
-    $(OBJ)$/process.obj     \
-    $(OBJ)$/brkpnts.obj     \
-    $(OBJ)$/mybasic.obj     \
-    $(OBJ)$/status.obj      \
-    $(OBJ)$/printer.obj     \
-    $(OBJ)$/appwin.obj      \
-    $(OBJ)$/appedit.obj     \
-    $(OBJ)$/appbased.obj    \
-    $(OBJ)$/apperror.obj    \
-    $(OBJ)$/textedit.obj    \
-    $(OBJ)$/msgedit.obj     \
-    $(OBJ)$/dialogs.obj     \
-
 EXCEPTIONSFILES = \
-    $(OBJ)$/app.obj \
-    $(OBJ)$/printer.obj     \
-    $(OBJ)$/process.obj
-
-.IF "$(GUI)" == "WNT"
-EXCEPTIONSFILES += \
-    $(OBJ)$/process.obj
-.ENDIF
+        $(OBJ)$/app.obj          \
+        $(OBJ)$/appbased.obj     \
+        $(OBJ)$/appedit.obj      \
+        $(OBJ)$/apperror.obj     \
+        $(OBJ)$/appwin.obj       \
+        $(OBJ)$/basicrt.obj	 \
+        $(OBJ)$/brkpnts.obj      \
+        $(OBJ)$/dialogs.obj      \
+        $(OBJ)$/msgedit.obj      \
+        $(OBJ)$/mybasic.obj	 \
+        $(OBJ)$/printer.obj      \
+        $(OBJ)$/process.obj      \
+        $(OBJ)$/status.obj       \
+        $(OBJ)$/textedit.obj
 
 SRS1NAME=$(TARGET)
 SRC1FILES = \
@@ -76,21 +65,8 @@ SRC1FILES = \
 LIB1TARGET=$(LB)$/app.lib
 LIB1ARCHIV=$(LB)$/libapp.a
 LIB1OBJFILES = \
-        $(OBJ)$/basicrt.obj	\
+        $(EXCEPTIONSFILES)       \
         $(OBJ)$/processw.obj     \
-        $(OBJ)$/process.obj      \
-        $(OBJ)$/brkpnts.obj      \
-        $(OBJ)$/app.obj          \
-        $(OBJ)$/mybasic.obj	\
-        $(OBJ)$/status.obj       \
-        $(OBJ)$/printer.obj      \
-        $(OBJ)$/appwin.obj       \
-        $(OBJ)$/appedit.obj      \
-        $(OBJ)$/appbased.obj     \
-        $(OBJ)$/apperror.obj     \
-        $(OBJ)$/textedit.obj     \
-        $(OBJ)$/msgedit.obj      \
-        $(OBJ)$/dialogs.obj      \
         $(OBJ)$/sbintern.obj
 
 # --- Targets ------------------------------------------------------------


More information about the Libreoffice-commits mailing list