Author: mseidel
Date: Fri Sep 28 07:26:58 2018
New Revision: 1842213
URL: http://svn.apache.org/viewvc?rev=1842213&view=rev
Log:
Minor cleanup
Modified:
openoffice/trunk/main/RepositoryExternal.mk
openoffice/trunk/main/RepositoryFixes.mk
Modified: openoffice/trunk/main/RepositoryExternal.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryExternal.mk?rev=1842213&r1=1842212&r2=1842213&view=diff
==============================================================================
--- openoffice/trunk/main/RepositoryExternal.mk (original)
+++ openoffice/trunk/main/RepositoryExternal.mk Fri Sep 28 07:26:58 2018
@@ -274,11 +274,11 @@ endef
else # !SYSTEM_GRAPHITE
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
- graphite \
+ graphite \
))
define gb_LinkTarget__use_graphite
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
- graphite \
+ graphite \
)
endef
@@ -329,13 +329,13 @@ else # !SYSTEM_OPENSSL
ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- crypto \
- ssl \
+ crypto \
+ ssl \
))
else
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
- crypto \
- ssl \
+ crypto \
+ ssl \
))
endif
@@ -366,12 +366,12 @@ ifeq ($(SYSTEM_APR),YES)
define gb_LinkTarget__use_apr
$(call gb_LinkTarget_add_defs,$(1),\
- -DSYSTEM_APR \
+ -DSYSTEM_APR \
)
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(APR_CFLAGS) \
-)
+)
$(call gb_LinkTarget_add_libs,$(1),$(APR_LIBS))
endef
@@ -556,7 +556,7 @@ ifeq ($(SYSTEM_HYPH),YES)
define gb_LinkTarget__use_hyphen
$(call gb_LinkTarget_add_defs,$(1),\
- -DSYSTEM_HYPH \
+ -DSYSTEM_HYPH \
)
$(call gb_LinkTarget_add_libs,$(1),$(HYPHEN_LIB))
endef
@@ -564,12 +564,12 @@ endef
else # !SYSTEM_HYPH
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
- hyphen \
+ hyphen \
))
define gb_LinkTarget__use_hyphen
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
- hyphen \
+ hyphen \
)
endef
@@ -633,8 +633,8 @@ ifeq ($(SYSTEM_HUNSPELL),YES)
define gb_LinkTarget__use_hunspell
$(call gb_LinkTarget_set_include,$(1),\
- $$(INCLUDE) \
- $(HUNSPELL_CFLAGS) \
+ $$(INCLUDE) \
+ $(HUNSPELL_CFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),$(HUNSPELL_LIBS))
endef
@@ -668,5 +668,4 @@ endef
endif # SYSTEM_HUNSPELL
-
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/RepositoryFixes.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryFixes.mk?rev=1842213&r1=1842212&r2=1842213&view=diff
==============================================================================
--- openoffice/trunk/main/RepositoryFixes.mk (original)
+++ openoffice/trunk/main/RepositoryFixes.mk Fri Sep 28 07:26:58 2018
@@ -107,8 +107,8 @@ gb_Library_FILENAMES := $(patsubst z:iz%
gb_Library_FILENAMES := $(patsubst
stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES))
# handle libraries in msvc format that don't use an "i" prefix for their
import library
-# these are libraries built by OOo, but only a few of them
-# all other libraries built by OOo and all platform libraries (exceptions see
below) are used without an import library
+# these are libraries built by AOO, but only a few of them
+# all other libraries built by AOO and all platform libraries (exceptions see
below) are used without an import library
# we link against their dlls in gcc format directly
gb_Library_NOILIBFILENAMES:=\
icudt \
@@ -193,7 +193,7 @@ gb_Library_DLLFILENAMES := $(patsubst z:
endif # ifneq ($(USE_MINGW),)
-else # ifeq ($(OS),WNT)
+else # ifeq ($(OS),WNT)
gb_Library_FILENAMES := $(patsubst
vbaobj:vbaobj.uno%,vbaobj:libvbaobj.uno%,$(gb_Library_FILENAMES))
