config_host.mk.in | 1
configure.ac | 2
desktop/Executable_crashrep.com.mk | 26 ----------
desktop/Executable_crashrep_com.mk | 26 ++++++++++
desktop/Executable_soffice.bin.mk | 58 ----------------------
desktop/Executable_soffice_bin.mk | 58 ++++++++++++++++++++++
desktop/Executable_unopkg.bin.mk | 31 ------------
desktop/Executable_unopkg.com.mk | 22 --------
desktop/Executable_unopkg_bin.mk | 31 ++++++++++++
desktop/Executable_unopkg_com.mk | 22 ++++++++
desktop/Module_desktop.mk | 8 +--
pyuno/Executable_python.mk | 24 +++++++++
pyuno/Executable_python_wrapper.mk | 24 ---------
pyuno/Module_pyuno.mk | 2
scp2/InstallModule_ooo.mk | 15 -----
shell/Library_syssh.mk | 22 +++++++-
shell/Library_syssh_win.mk | 33 -------------
shell/Module_shell.mk | 3 -
svx/Executable_gengal.bin.mk | 71 ----------------------------
svx/Executable_gengal.mk | 71 ++++++++++++++++++++++++++++
svx/Module_svx.mk | 2
unodevtools/Executable_skeletonmaker.mk | 41 ----------------
unodevtools/Executable_uno-skeletonmaker.mk | 41 ++++++++++++++++
unodevtools/Module_unodevtools.mk | 2
24 files changed, 301 insertions(+), 335 deletions(-)
New commits:
commit 916e86e9d9d596c7aa12e0a1d8bbacdd4a2e4598
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Mar 3 23:30:24 2014 +0100
svx: rename Executable_gengal.bin.mk too
Change-Id: I8dfe131d1c225b5d9aaa044b02ec8cdc3d97a23c
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.mk
similarity index 100%
rename from svx/Executable_gengal.bin.mk
rename to svx/Executable_gengal.mk
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index e304ed9..007fe34 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Module_add_l10n_targets,svx,\
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,svx,\
- Executable_gengal.bin \
+ Executable_gengal \
Package_gengal \
))
endif
commit c02a905115bfcbe06c384e5fcad56eecd3b81fdf
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Mar 3 23:28:28 2014 +0100
desktop: rename Executable*.bin.mk/.com.mk
Change-Id: Ibb0970cfde65b331a4b870cc254b0a6481889edf
diff --git a/desktop/Executable_crashrep.com.mk
b/desktop/Executable_crashrep_com.mk
similarity index 100%
rename from desktop/Executable_crashrep.com.mk
rename to desktop/Executable_crashrep_com.mk
diff --git a/desktop/Executable_soffice.bin.mk
b/desktop/Executable_soffice_bin.mk
similarity index 100%
rename from desktop/Executable_soffice.bin.mk
rename to desktop/Executable_soffice_bin.mk
diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg_bin.mk
similarity index 100%
rename from desktop/Executable_unopkg.bin.mk
rename to desktop/Executable_unopkg_bin.mk
diff --git a/desktop/Executable_unopkg.com.mk b/desktop/Executable_unopkg_com.mk
similarity index 100%
rename from desktop/Executable_unopkg.com.mk
rename to desktop/Executable_unopkg_com.mk
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index c325176..584b70d 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -37,8 +37,8 @@ endif
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,desktop,\
- Executable_soffice.bin \
- Executable_unopkg.bin \
+ Executable_soffice_bin \
+ Executable_unopkg_bin \
Library_migrationoo2 \
Library_migrationoo3 \
Library_unopkgapp \
@@ -65,7 +65,7 @@ ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,desktop,\
StaticLibrary_winextendloaderenv \
StaticLibrary_winlauncher \
- Executable_crashrep.com \
+ Executable_crashrep_com \
Executable_quickstart \
Executable_sbase \
Executable_scalc \
@@ -77,7 +77,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
Executable_swriter \
Executable_unoinfo \
Executable_unopkg \
- Executable_unopkg.com \
+ Executable_unopkg_com \
WinResTarget_quickstart \
WinResTarget_sbase \
WinResTarget_scalc \
commit fd7cf77ad5e353d4332ed65dfa4252c841cd85f7
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Mar 3 22:47:30 2014 +0100
pyuno: rename Executable_python_wrapper.mk
Change-Id: I653cb0e36c1faa622ecc90e0316a1f1fd1e843db
diff --git a/pyuno/Executable_python_wrapper.mk b/pyuno/Executable_python.mk
similarity index 100%
rename from pyuno/Executable_python_wrapper.mk
rename to pyuno/Executable_python.mk
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk
index b79c21d..9a07993 100644
--- a/pyuno/Module_pyuno.mk
+++ b/pyuno/Module_pyuno.mk
@@ -33,7 +33,7 @@ endif
# zipcore: pyuno/python.exe on Windows
ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,pyuno,\
- Executable_python_wrapper \
+ Executable_python \
))
endif
commit b3ccc2360492a0d50e4c86195836a840cd3d419a
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Mar 3 22:42:22 2014 +0100
unodevtools: rename makefile like the Executable
Change-Id: Icf8df0829aecf838d0037a3393f27e90c23b9548
diff --git a/unodevtools/Executable_skeletonmaker.mk
b/unodevtools/Executable_uno-skeletonmaker.mk
similarity index 100%
rename from unodevtools/Executable_skeletonmaker.mk
rename to unodevtools/Executable_uno-skeletonmaker.mk
diff --git a/unodevtools/Module_unodevtools.mk
b/unodevtools/Module_unodevtools.mk
index 0e45ae7..95aa460 100644
--- a/unodevtools/Module_unodevtools.mk
+++ b/unodevtools/Module_unodevtools.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,unodevtools))
ifneq (,$(filter ODK,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,unodevtools,\
- Executable_skeletonmaker \
+ Executable_uno-skeletonmaker \
))
endif
commit 42c9f35da2c2479113ae7dab8426d2d18986aca7
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Mar 3 22:39:09 2014 +0100
shell: get rid of separate Library_syssh_win.mk
Change-Id: I12f38bab6ea7207b79994556f0ab6798d2d1d9da
diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk
index ddd2682..17ee516 100644
--- a/shell/Library_syssh.mk
+++ b/shell/Library_syssh.mk
@@ -18,6 +18,22 @@ $(eval $(call gb_Library_use_libraries,syssh,\
$(gb_UWINAPI) \
))
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Library_use_system_win32_libs,syssh,\
+ ole32 \
+ shell32 \
+))
+
+$(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh))
+
+$(eval $(call gb_Library_add_exception_objects,syssh,\
+ shell/source/win32/SysShExec \
+ shell/source/win32/SysShentry \
+))
+
+else # OS != WNT
+
$(eval $(call gb_Library_use_static_libraries,syssh,\
shell_xmlparser \
))
@@ -25,8 +41,10 @@ $(eval $(call gb_Library_use_static_libraries,syssh,\
$(eval $(call gb_Library_set_componentfile,syssh,shell/source/unix/exec/syssh))
$(eval $(call gb_Library_add_exception_objects,syssh,\
- shell/source/unix/exec/shellexec \
- shell/source/unix/exec/shellexecentry \
+ shell/source/unix/exec/shellexec \
+ shell/source/unix/exec/shellexecentry \
))
+endif # OS
+
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Library_syssh_win.mk b/shell/Library_syssh_win.mk
deleted file mode 100644
index 016bf1b..0000000
--- a/shell/Library_syssh_win.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,syssh))
-
-$(eval $(call gb_Library_use_sdk_api,syssh))
-
-$(eval $(call gb_Library_use_libraries,syssh,\
- cppu \
- cppuhelper \
- sal \
- $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_Library_use_system_win32_libs,syssh,\
- ole32 \
- shell32 \
-))
-
-$(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh))
-
-$(eval $(call gb_Library_add_exception_objects,syssh,\
- shell/source/win32/SysShExec \
- shell/source/win32/SysShentry \
-))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 3461381..3b84d24 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -57,7 +57,6 @@ $(eval $(call gb_Module_add_targets,shell,\
Executable_regsvrex \
Executable_senddoc \
Library_smplmail \
- Library_syssh_win \
Library_wininetbe \
StaticLibrary_simplemapi \
))
@@ -101,6 +100,7 @@ ifeq ($(filter DESKTOP,$(BUILD_TYPE)),DESKTOP)
$(eval $(call gb_Module_add_targets,shell,\
Executable_lngconvex \
+ Library_syssh \
))
ifneq ($(OS),WNT)
@@ -109,7 +109,6 @@ $(eval $(call gb_Module_add_targets,shell,\
Executable_gnome_open_url \
Executable_uri_encode \
Library_cmdmail \
- Library_syssh \
Package_scripts \
Package_scripts_gnome \
Package_scripts_kde \
commit d49543cefb517ad94d696f36dd43be527acaccd5
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Mar 3 22:08:34 2014 +0100
scp2: remove some variable/macro cruft
Change-Id: If07b243e71be7c67d36e3d652c52781ef902e380
diff --git a/config_host.mk.in b/config_host.mk.in
index b9be85d..2108ffe 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -350,7 +350,6 @@ export LIBXML_JAR=@LIBXML_JAR@
export LIBXML_LIBS=$(gb_SPACE)@LIBXML_LIBS@
export LIBXSLT_CFLAGS=$(gb_SPACE)@LIBXSLT_CFLAGS@
export LIBXSLT_LIBS=$(gb_SPACE)@LIBXSLT_LIBS@
-export LIBXSLT_MAJOR=@LIBXSLT_MAJOR@
export LINK_X64_BINARY=@LINK_X64_BINARY@
@x_Cygwin@ export LS=@WIN_LS@
export MACOSX_BUNDLE_IDENTIFIER=@MACOSX_BUNDLE_IDENTIFIER@
diff --git a/configure.ac b/configure.ac
index 35b13d5..ed37a79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7756,7 +7756,6 @@ if test "$with_system_libxml" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBXSLT=
- LIBXSLT_MAJOR=1
BUILD_TYPE="$BUILD_TYPE LIBXSLT"
if test "$cross_compiling" = "yes"; then
@@ -7776,7 +7775,6 @@ AC_SUBST(LIBEXSLT_CFLAGS)
AC_SUBST(LIBEXSLT_LIBS)
AC_SUBST(LIBXSLT_CFLAGS)
AC_SUBST(LIBXSLT_LIBS)
-AC_SUBST(LIBXSLT_MAJOR)
AC_SUBST(XSLTPROC)
# ===================================================================
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 63d8b1b..d76394c 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -107,21 +107,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DICU_MAJOR=$(ICU_MAJOR) \
))
-ifeq ($(SYSTEM_LIBXSLT),)
-$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
- -DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR) \
-))
-endif
-
-ifeq ($(SYSTEM_REDLAND),)
-
-$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
- -DRAPTOR_MAJOR=$(RAPTOR_MAJOR) \
- -DRASQAL_MAJOR=$(RASQAL_MAJOR) \
- -DREDLAND_MAJOR=$(REDLAND_MAJOR) \
-))
-endif
-
ifeq ($(SYSTEM_JFREEREPORT),)
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
