diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-21 13:21:30 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-21 13:21:30 +0200 |
| commit | 531c1e2455f418817079bfecbfa00f5164b2360d (patch) | |
| tree | 2c4b0d3a01d7f4b399f9e3ed97224e388c11c85b /starmath/Library_sm.mk | |
| parent | 4789e1366182b6ebfda836f02ac4303c3785b203 (diff) | |
gnumake4: postmerge fixes in starmath
Diffstat (limited to 'starmath/Library_sm.mk')
| -rw-r--r-- | starmath/Library_sm.mk | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index c1c03aa0e576..20e797d69018 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 \ |