summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2011-12-19 15:26:33 +0100
committerMichael Stahl <mstahl@redhat.com>2011-12-19 15:26:33 +0100
commite1d34f15cc82b4e9b10eca0e8efb50793080f1b6 (patch)
tree50ed5a4dad66d6513a4533b6db8272661c49fc4a
parentextensions: add to tail_build (diff)
downloadcore-e1d34f15cc82b4e9b10eca0e8efb50793080f1b6.tar.gz
core-e1d34f15cc82b4e9b10eca0e8efb50793080f1b6.zip
extensions: what is all this realpath stuff doing?
-rw-r--r--extensions/AllLangResTarget_abp.mk2
-rw-r--r--extensions/AllLangResTarget_bib.mk6
-rw-r--r--extensions/AllLangResTarget_dbp.mk2
-rw-r--r--extensions/CppunitTest_extensions_test_update.mk2
-rw-r--r--extensions/Library_abp.mk4
-rw-r--r--extensions/Library_bib.mk2
-rw-r--r--extensions/Library_dbp.mk4
-rw-r--r--extensions/Library_so_activex_x64.mk2
8 files changed, 10 insertions, 14 deletions
diff --git a/extensions/AllLangResTarget_abp.mk b/extensions/AllLangResTarget_abp.mk
index 30371f93a648..cda588efb24d 100644
--- a/extensions/AllLangResTarget_abp.mk
+++ b/extensions/AllLangResTarget_abp.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,abp/res))
$(eval $(call gb_SrsTarget_set_include,abp/res,\
$$(INCLUDE) \
- -I$(realpath $(SRCDIR)/extensions/inc) \
+ -I$(SRCDIR)/extensions/inc \
))
$(eval $(call gb_SrsTarget_add_files,abp/res,\
diff --git a/extensions/AllLangResTarget_bib.mk b/extensions/AllLangResTarget_bib.mk
index 36b22c392b1f..bcc5d1e10e8f 100644
--- a/extensions/AllLangResTarget_bib.mk
+++ b/extensions/AllLangResTarget_bib.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,bib/res))
$(eval $(call gb_SrsTarget_set_include,bib/res,\
$$(INCLUDE) \
- -I$(realpath $(SRCDIR)/extensions/inc) \
+ -I$(SRCDIR)/extensions/inc \
))
$(eval $(call gb_SrsTarget_add_files,bib/res,\
@@ -46,8 +46,4 @@ $(eval $(call gb_SrsTarget_add_files,bib/res,\
extensions/source/bibliography/toolbar.src \
))
-$(eval $(call gb_SrsTarget_add_templates,bib/res,\
- extensions/source/bibliography/bib.hrc \
-))
-
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/AllLangResTarget_dbp.mk b/extensions/AllLangResTarget_dbp.mk
index 657694af7e22..88cc38992b4c 100644
--- a/extensions/AllLangResTarget_dbp.mk
+++ b/extensions/AllLangResTarget_dbp.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,dbp/res))
$(eval $(call gb_SrsTarget_set_include,dbp/res,\
$$(INCLUDE) \
- -I$(realpath $(SRCDIR)/extensions/inc) \
+ -I$(SRCDIR)/extensions/inc \
))
$(eval $(call gb_SrsTarget_add_files,dbp/res,\
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index f0b9a0567bc0..7ada5af2f06d 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_CppunitTest_use_external,extensions_test_update,curl))
$(eval $(call gb_CppunitTest_set_include,extensions_test_update,\
$$(INCLUDE) \
- -I$(realpath $(SRCDIR)/extensions/inc) \
+ -I$(SRCDIR)/extensions/inc \
-I$(OUTDIR)/inc \
))
diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk
index 411c2d823ccf..8460cf81b066 100644
--- a/extensions/Library_abp.mk
+++ b/extensions/Library_abp.mk
@@ -34,8 +34,8 @@ $(eval $(call gb_Library_set_componentfile,abp,extensions/source/abpilot/abp))
$(eval $(call gb_Library_set_include,abp,\
$$(INCLUDE) \
- -I$(realpath $(SRCDIR)/extensions/inc) \
- -I$(realpath $(SRCDIR)/extensions/source/inc) \
+ -I$(SRCDIR)/extensions/inc \
+ -I$(SRCDIR)/extensions/source/inc \
))
ifneq ($(WITH_MOZILLA),NO)
diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk
index 3a9c0107a568..27d311f306e4 100644
--- a/extensions/Library_bib.mk
+++ b/extensions/Library_bib.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_componentfile,bib,extensions/source/bibliography/bi
$(eval $(call gb_Library_set_include,bib,\
$$(INCLUDE) \
- -I$(realpath $(SRCDIR)/extensions/inc) \
+ -I$(SRCDIR)/extensions/inc \
))
$(eval $(call gb_Library_add_api,bib,\
diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk
index c7fd685cc3ce..dc7f55b5d907 100644
--- a/extensions/Library_dbp.mk
+++ b/extensions/Library_dbp.mk
@@ -34,8 +34,8 @@ $(eval $(call gb_Library_set_componentfile,dbp,extensions/source/dbpilots/dbp))
$(eval $(call gb_Library_set_include,dbp,\
$$(INCLUDE) \
- -I$(realpath $(SRCDIR)/extensions/inc) \
- -I$(realpath $(SRCDIR)/extensions/source/inc) \
+ -I$(SRCDIR)/extensions/inc \
+ -I$(SRCDIR)/extensions/source/inc \
))
$(eval $(call gb_Library_add_defs,dbp,\
diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
index f7cfa0b2a257..43176723b406 100644
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -36,7 +36,7 @@ $(SRCDIR)/extensions/source/activex/so_activex.cxx: $(WORKDIR)/CustomTarget/so_a
$(eval $(call gb_Library_set_include,so_activex_x64,\
$$(INCLUDE) \
- -I$(realpath $(SRCDIR)/extensions/source/activex) \
+ -I$(SRCDIR)/extensions/source/activex \
-I$(WORKDIR)/CustomTarget/so_activex \
$(foreach i,$(ATL_INCLUDE), -I$(i)) \
))