diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:07:21 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:07:21 +0000 |
commit | bd1d85706e12416173e07123bf371b5b4497e9cf (patch) | |
tree | 2d9fd5908afb7aa1734001c07b71fac3655096f4 | |
parent | ffadf10e41161d1296088647b7992975a849d8b5 (diff) |
INTEGRATION: CWS ause084_DEV300 (1.3.424); FILE MERGED
2008/02/14 16:35:05 hjs 1.3.424.4: RESYNC: (1.4-1.5); FILE MERGED
2007/12/18 12:59:08 hjs 1.3.424.3: #i79548# build better...
2007/12/05 10:41:02 hjs 1.3.424.2: RESYNC: (1.3-1.4); FILE MERGED
2007/07/13 16:24:57 hjs 1.3.424.1: #i79548# replace explicit quote; fix dependencies and useless LIB target
-rw-r--r-- | vcl/unx/gtk/a11y/makefile.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vcl/unx/gtk/a11y/makefile.mk b/vcl/unx/gtk/a11y/makefile.mk index fd4c358fae22..bc2dc8464775 100644 --- a/vcl/unx/gtk/a11y/makefile.mk +++ b/vcl/unx/gtk/a11y/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: rt $ $Date: 2008-01-29 16:20:41 $ +# last change: $Author: kz $ $Date: 2008-03-06 15:07:21 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -41,7 +41,6 @@ ENABLE_EXCEPTIONS=TRUE # workaround for makedepend hang MKDEPENDSOLVER= -LIBTARGET=NO NO_DEFAULT_STL=YES # --- Settings ----------------------------------------------------- @@ -62,7 +61,7 @@ dummy: PKGCONFIG_MODULES=gtk+-2.0 .INCLUDE : pkg_config.mk -CFLAGS+=-DVERSION=\"$(UPD)$(LAST_MINOR)\" +CFLAGS+=-DVERSION=$(EMQ)"$(UPD)$(LAST_MINOR)$(EMQ)" ATKVERSION:=$(shell @$(PKGCONFIG) --modversion atk | $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk) @@ -70,8 +69,7 @@ ATKVERSION:=$(shell @$(PKGCONFIG) --modversion atk | $(AWK) -v num=true -f $(SOL CFLAGS+=-DHAS_ATKRECTANGLE .ENDIF -LIB1TARGET=$(SLB)$/$(TARGET).lib -LIB1OBJFILES=\ +SLOFILES=\ $(SLO)$/atkaction.obj \ $(SLO)$/atkbridge.obj \ $(SLO)$/atkcomponent.obj \ |