From 6f6f7a17dc82248446dc4eddfd51af08362fc352 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 26 Sep 2012 23:45:28 +0200 Subject: gbuild: split uwinapi out of gb_STDLIBS Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7 --- forms/Library_frm.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'forms') diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 126bc5f339f2..2b4361fde1ca 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -57,6 +57,7 @@ $(eval $(call gb_Library_use_libraries,frm,\ ucbhelper \ utl \ vcl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) -- cgit From 816ec4b0933e36ac468230365359c3b9d8d52986 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 27 Sep 2012 00:49:12 +0200 Subject: gbuild: replace direct gb_STDLIBS use with ... ... new gb_LinkTarget_add_standard_system_libs Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69 --- forms/Library_frm.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'forms') diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 2b4361fde1ca..809bef707b6e 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -58,9 +58,10 @@ $(eval $(call gb_Library_use_libraries,frm,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,frm)) + ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,frm,\ icuin \ -- cgit From f011af716e2978cbf9fcb7748dc868c503edddff Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 16:29:24 +0200 Subject: gbuild: invert handling of standard system libraries: Always link in gb_STDLIBS, except when the library explicitly opts out with gb_LinkTarget_disable_standard_system_libs. Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a --- forms/Library_frm.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'forms') diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 809bef707b6e..e86803163839 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -60,8 +60,6 @@ $(eval $(call gb_Library_use_libraries,frm,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,frm)) - ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_use_externals,frm,\ icuin \ -- cgit From 39bac3f6c0a29d4d6ef7d6a636b8204cf12b4866 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 1 Oct 2012 15:19:10 +0200 Subject: translations is a source-only module Change-Id: I9fcddfcdfa2d60860a7b016dbb870a3b6e8f3ea4 --- forms/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'forms') diff --git a/forms/prj/build.lst b/forms/prj/build.lst index 599b6c7de5e7..b48cd5d58935 100644 --- a/forms/prj/build.lst +++ b/forms/prj/build.lst @@ -1,4 +1,4 @@ -fm forms : TRANSLATIONS:translations oovbaapi salhelper svx sfx2 QADEVOOO:qadevOOo LIBXSLT:libxslt NULL +fm forms : oovbaapi salhelper svx sfx2 QADEVOOO:qadevOOo LIBXSLT:libxslt NULL fm forms usr1 - all fm_mkofrm NULL fm forms\prj nmake - all fm_prj NULL -- cgit