diff options
| author | Eike Rathke <erack@redhat.com> | 2012-01-13 22:43:35 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-01-13 22:43:58 +0100 |
| commit | f1d713a1a768c77bfa287e7c6a3ac0fa7053c882 (patch) | |
| tree | 040f112a02a47fc88a751760b64dbc3b983025bd | |
| parent | f212a2a7c4380a107785a3fba7b48bf38937842e (diff) | |
use INCLUDE instead of SOLARINC, and after local includes
| -rw-r--r-- | dbaccess/Library_dbui.mk | 2 | ||||
| -rw-r--r-- | svl/Library_fsstorage.mk | 2 | ||||
| -rw-r--r-- | svl/Library_passwordcontainer.mk | 2 | ||||
| -rw-r--r-- | svl/Library_svl.mk | 2 | ||||
| -rw-r--r-- | svx/Library_svx.mk | 2 | ||||
| -rw-r--r-- | xmloff/Library_xo.mk | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk index a5e021b97c9c..f17a8b7ff333 100644 --- a/dbaccess/Library_dbui.mk +++ b/dbaccess/Library_dbui.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,dbui,\ -I$(SRCDIR)/dbaccess/source/ui/inc \ -I$(SRCDIR)/dbaccess/source/ui/dlg \ -I$(SRCDIR)/dbaccess/source/inc \ - $$(SOLARINC) \ + $$(INCLUDE) \ )) $(eval $(call gb_Library_add_api,dbui,\ diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index 29b465347043..2247c9a0093d 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -31,13 +31,13 @@ $(eval $(call gb_Library_Library,fsstorage)) $(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage)) $(eval $(call gb_Library_set_include,fsstorage,\ - $$(SOLARINC) \ -I$(WORKDIR)/inc/svl \ -I$(WORKDIR)/inc/ \ -I$(realpath $(SRCDIR)/svl/inc) \ -I$(realpath $(SRCDIR)/svl/inc/svl) \ -I$(realpath $(SRCDIR)/svl/source/inc) \ -I$(OUTDIR)/inc \ + $$(INCLUDE) \ )) $(eval $(call gb_Library_add_api,fsstorage,\ diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index d1a740c36a2d..6b577b62cc06 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -31,13 +31,13 @@ $(eval $(call gb_Library_Library,passwordcontainer)) $(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer)) $(eval $(call gb_Library_set_include,passwordcontainer,\ - $$(SOLARINC) \ -I$(WORKDIR)/inc/svl \ -I$(WORKDIR)/inc/ \ -I$(realpath $(SRCDIR)/svl/inc) \ -I$(realpath $(SRCDIR)/svl/inc/svl) \ -I$(realpath $(SRCDIR)/svl/source/inc) \ -I$(OUTDIR)/inc \ + $$(INCLUDE) \ )) $(eval $(call gb_Library_add_api,passwordcontainer,\ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 216a80d8e8db..337e4edec87f 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -33,8 +33,8 @@ $(eval $(call gb_Library_add_package_headers,svl,svl_inc)) $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl)) $(eval $(call gb_Library_set_include,svl,\ - $$(SOLARINC) \ -I$(realpath $(SRCDIR)/svl/source/inc) \ + $$(INCLUDE) \ )) $(eval $(call gb_Library_add_api,svl,\ diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 9165c9ef0dcf..0e338b38b7ee 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_componentfile,svx,svx/util/svx)) $(eval $(call gb_Library_set_include,svx,\ -I$(realpath $(SRCDIR)/svx/inc) \ -I$(realpath $(SRCDIR)/svx/source/inc) \ - $$(SOLARINC) \ + $$(INCLUDE) \ )) $(eval $(call gb_Library_add_api,svx,\ diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 11173d93051f..558b5f3b537d 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -33,8 +33,8 @@ $(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo)) $(eval $(call gb_Library_add_package_headers,xo,xmloff_inc)) $(eval $(call gb_Library_set_include,xo,\ - $$(SOLARINC) \ -I$(realpath $(SRCDIR)/xmloff/inc) \ + $$(INCLUDE) \ )) $(eval $(call gb_Library_add_defs,xo,\ |