mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mingwport29: merge with DEV300 m75

Browse Source
This commit is contained in:
tono
2010-03-24 06:43:30 +09:00
parent 11da7a9647 bc55949afd
commit 57c06926ac
6 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
external/prj/build.lst vendored
View File

@@ -1,4 +1,4 @@
el external : SO:external_so soltools NULL el external : soltools NULL
el external usr1 - all el_mkout NULL el external usr1 - all el_mkout NULL
el external\glibc nmake - all el_glibc NULL el external\glibc nmake - all el_glibc NULL
el external\gcc3_specific nmake - all el_gcc3 NULL el external\gcc3_specific nmake - all el_gcc3 NULL

1
libxmlsec/makefile.mk
View File

@@ -127,6 +127,7 @@ xmlsec_CFLAGS+=$(C_RESTRICTIONFLAGS)
.ENDIF # "$(COMNAME)"=="sunpro5" .ENDIF # "$(COMNAME)"=="sunpro5"
.IF "$(EXTRA_CFLAGS)"!="" .IF "$(EXTRA_CFLAGS)"!=""
xmlsec_CFLAGS+=$(EXTRA_CFLAGS) xmlsec_CFLAGS+=$(EXTRA_CFLAGS)
xmlsec_CPPFLAGS+=$(EXTRA_CFLAGS)
.ENDIF # "$(EXTRA_CFLAGS)"!="" .ENDIF # "$(EXTRA_CFLAGS)"!=""
xmlsec_LDFLAGS+=-L$(SYSBASE)$/usr$/lib xmlsec_LDFLAGS+=-L$(SYSBASE)$/usr$/lib
.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!="" .ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""

3
redland/rasqal/makefile.mk
View File

@@ -55,8 +55,7 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.autotools \ $(TARFILE_NAME).patch.autotools \
$(TARFILE_NAME).patch.ooo_build \ $(TARFILE_NAME).patch.ooo_build \
$(TARFILE_NAME).patch.dmake \ $(TARFILE_NAME).patch.dmake \
$(TARFILE_NAME).patch.win32 \ $(TARFILE_NAME).patch.win32
PATCH_FILES=$(OOO_PATCH_FILES) PATCH_FILES=$(OOO_PATCH_FILES)

22
redland/rasqal/rasqal-0.9.16.patch.ooo_build
View File

@@ -32,3 +32,25 @@
fi fi
if test "$echo_libtool_libs" = "yes"; then if test "$echo_libtool_libs" = "yes"; then
echo @libdir@/@RASQAL_LIBTOOLLIBS@ echo @libdir@/@RASQAL_LIBTOOLLIBS@
--- misc/rasqal-0.9.16/Makefile.am 2010-02-12 08:43:21.000000000 +0000
+++ misc/build/rasqal-0.9.16/Makefile.am 2010-02-12 08:43:56.000000000 +0000
@@ -22,7 +22,7 @@
noinst_SCRIPTS = rasqal-src-config
-SUBDIRS=src utils tests docs data win32
+SUBDIRS=src tests docs data win32
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = rasqal.pc
--- misc/rasqal-0.9.16/Makefile.in 2010-02-12 08:43:19.000000000 +0000
+++ misc/build/rasqal-0.9.16/Makefile.in 2010-02-12 08:44:03.000000000 +0000
@@ -242,7 +242,7 @@
with_raptor = @with_raptor@
with_redland = @with_redland@
noinst_SCRIPTS = rasqal-src-config
-SUBDIRS = src utils tests docs data win32
+SUBDIRS = src tests docs data win32
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = rasqal.pc
EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \

7
redland/redland/makefile.mk
View File

@@ -54,14 +54,13 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.legal \ $(TARFILE_NAME).patch.legal \
$(TARFILE_NAME).patch.autotools \ $(TARFILE_NAME).patch.autotools \
$(TARFILE_NAME).patch.dmake \ $(TARFILE_NAME).patch.dmake \
$(TARFILE_NAME).patch.win32 \ $(TARFILE_NAME).patch.ooo_build \
$(TARFILE_NAME).patch.win32
PATCH_FILES=$(OOO_PATCH_FILES) \ PATCH_FILES=$(OOO_PATCH_FILES) \
$(TARFILE_NAME).patch.free_null \ $(TARFILE_NAME).patch.free_null \
$(TARFILE_NAME).patch.storage_hashes_context_serialize_get_statement \ $(TARFILE_NAME).patch.storage_hashes_context_serialize_get_statement \
$(TARFILE_NAME).patch.storage_hashes_list_duplicates \ $(TARFILE_NAME).patch.storage_hashes_list_duplicates
.IF "$(OS)"=="OS2" .IF "$(OS)"=="OS2"
BUILD_ACTION=dmake BUILD_ACTION=dmake

22
redland/redland/redland-1.0.8.patch.ooo_build Normal file
View File

@@ -0,0 +1,22 @@
--- misc/redland-1.0.8/Makefile.am 2010-02-12 08:47:40.000000000 +0000
+++ misc/build/redland-1.0.8/Makefile.am 2010-02-12 08:47:51.000000000 +0000
@@ -48,7 +48,7 @@
# to ensure that the raptor and rasqal subdirectories are called
# as CONFIG_SUBDIR directories.
#
-SUBDIRS=@LOCAL_SUBDIRS@ librdf examples utils demos docs data
+SUBDIRS=@LOCAL_SUBDIRS@ librdf examples demos docs data
EXTRA_DIST=ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
ChangeLog.5 ChangeLog.6 ChangeLog.7 \
--- misc/redland-1.0.8/Makefile.in 2010-02-12 08:47:39.000000000 +0000
+++ misc/build/redland-1.0.8/Makefile.in 2010-02-12 08:47:55.000000000 +0000
@@ -283,7 +283,7 @@
# to ensure that the raptor and rasqal subdirectories are called
# as CONFIG_SUBDIR directories.
#
-SUBDIRS = @LOCAL_SUBDIRS@ librdf examples utils demos docs data
+SUBDIRS = @LOCAL_SUBDIRS@ librdf examples demos docs data
EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
ChangeLog.5 ChangeLog.6 ChangeLog.7 \
README NEWS LICENSE.txt TODO \