[Libreoffice-commits] .: Branch 'feature/gnumake4' - starmath/Library_smd.mk starmath/Library_sm.mk

[Bjoern Michaelsen]

 starmath/Library_sm.mk  |   11 ++---------
 starmath/Library_smd.mk |    1 -
 2 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 90f4dd90e6b314dbc72e271c38dc958a8c9a448e
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jun 21 13:21:30 2011 +0200

    gnumake4: postmerge fixes in starmath

diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index c1c03aa..20e797d 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -31,17 +31,11 @@ $(eval $(call gb_Library_set_include,sm,\
         -I$(realpath $(SRCDIR)/starmath/inc/pch) \
         -I$(realpath $(SRCDIR)/starmath/inc) \
         -I$(WORKDIR)/SdiTarget/starmath/sdi \
-        -I$(WORKDIR)/Misc/starmath/ \
         $$(INCLUDE) \
         -I$(OUTDIR)/inc/offuh \
         -I$(OUTDIR)/inc \
 ))
 
-$(eval $(call gb_Library_add_defs,sm,\
-        -DSMDLL \
-        -DSC_INFO_OSVERSION=\"$(OS)\" \
-))
-
 $(eval $(call gb_Library_add_linked_libs,sm,\
         comphelper \
         cppu \
@@ -59,7 +53,6 @@ $(eval $(call gb_Library_add_linked_libs,sm,\
         tl \
         utl \
         vcl \
-	ucbhelper \
 	xo \
 ))
 
@@ -73,6 +66,7 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
         starmath/source/dialog \
         starmath/source/document \
         starmath/source/edit \
+        starmath/source/eqnolefilehdr \
         starmath/source/format \
         starmath/source/mathmlexport \
         starmath/source/mathmlimport \
@@ -80,8 +74,7 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
         starmath/source/node \
         starmath/source/parse \
         starmath/source/rect \
-        starmath/source/register \
-	starmath/source/smdll \
+		starmath/source/smdll \
         starmath/source/smmod \
         starmath/source/symbol \
         starmath/source/toolbox \
diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk
index 5ea8fda..d1596e7 100644
--- a/starmath/Library_smd.mk
+++ b/starmath/Library_smd.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_Library_add_linked_libs,smd,\
 ))
 
 $(eval $(call gb_Library_add_exception_objects,smd,\
-	starmath/source/detreg \
 	starmath/source/smdetect \
 ))