diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-02-22 21:33:23 -0500 |
|---|---|---|
| committer | David Ostrovsky <David.Ostrovsky@gmx.de> | 2013-02-24 10:34:40 +0000 |
| commit | 61e7c592faa2d768d599936e57042eb22bcaa16f (patch) | |
| tree | 2be399d2aa1179fc4d982f3074481ec8fd49a84c /RepositoryExternal.mk | |
| parent | a5a24fa0241930ae5f9d8a4c757e479d2de3efb6 (diff) | |
convert moz to gbuild and add to tail_build
Change-Id: I2d3f5d127f831ee9abc020d46558f7cfbe8c9380
Reviewed-on: https://gerrit.libreoffice.org/2349
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index aed173be9ad7..0298234d1759 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1926,15 +1926,6 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ endif # SYSTEM_POSTGRESQL ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) -ifeq ($(SYSTEM_MOZILLA),YES) - -# Nothing needed here ATM -define gb_LinkTarget__use_mozilla - -endef - -else # !SYSTEM_MOZILLA - define gb_LinkTarget__use_mozilla $(call gb_LinkTarget_add_defs,$(1),\ @@ -1943,8 +1934,7 @@ $(call gb_LinkTarget_add_defs,$(1),\ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - -I$(OUTDIR)/inc/mozilla/moz \ - -I$(OUTDIR)/inc/mozilla/nspr \ + -I$(OUTDIR)/inc/mozilla \ ) $(call gb_LinkTarget_use_libraries,$(1),\ @@ -1958,8 +1948,6 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ mozreg_s \ ) -ifeq ($(OS),WNT) - $(call gb_LinkTarget_add_defs,$(1),\ -DMOZILLA_CLIENT \ -DMOZ_REFLOW_PERF \ @@ -2001,33 +1989,6 @@ $(call gb_LinkTarget_add_libs,$(1),\ endif # !GCC -else - -$(call gb_LinkTarget_add_defs,$(1),\ - -DMOZILLA_CLIENT \ - -DXP_UNIX \ - $(if $(filter LINUX,$(OS)),-DOJI) \ - $(if $(filter LINUX MACOSX NETBSD,$(OS)),-DTRACING) \ -) - -$(call gb_LinkTarget_add_cflags,$(1),\ - $(if $(filter LINUX,$(OS)),-g) \ - $(if $(filter LINUX MACOSX NETBSD,$(OS)),-fPIC) \ -) - -$(call gb_LinkTarget_add_cxxflags,$(1),\ - -Wcast-align \ - -Wconversion \ - -Wno-long-long \ - -Woverloaded-virtual \ - -Wpointer-arith \ - -Wsynth \ - $(if $(filter LINUX,$(OS)),-pthread) \ - $(if $(filter MACOSX NETBSD,$(OS)),-Wno-deprecated) \ -) - -endif # UNX - endef $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\ @@ -2040,7 +2001,6 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ mozreg_s \ )) -endif # SYSTEM_MOZILLA endif # DESKTOP ifeq ($(ENABLE_KDE),TRUE) |