[Libreoffice-commits] .: external/glibc libtextcat/makefile.mk libxmlsec/makefile.mk redland/raptor redland/rasqal redland/redland
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Wed Feb 2 03:13:45 PST 2011
external/glibc/makefile.mk | 1 -
libtextcat/makefile.mk | 2 --
libxmlsec/makefile.mk | 3 ---
redland/raptor/makefile.mk | 2 --
redland/rasqal/makefile.mk | 2 --
redland/redland/makefile.mk | 2 --
6 files changed, 12 deletions(-)
New commits:
commit 7c9c34ddb6047a423b7f7c85f63b0f99d5814719
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Feb 2 11:50:17 2011 +0100
Clean up makefiles
diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk
index 04e2ff5..f7a3b1e 100644
--- a/external/glibc/makefile.mk
+++ b/external/glibc/makefile.mk
@@ -47,7 +47,6 @@ ADDITIONAL_FILES += posix$/readdir_r.c
PATCH_FILES=$(PRJ)$/glibc-2.1.3.patch
-#CONFIGURE_DIR=glibc-2.1.3/posix
CONFIGURE_ACTION=
BUILD_DIR=posix
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index 526c23c..69e3dc0 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -58,8 +58,6 @@ ADDITIONAL_FILES= \
src$/libtextcat.map
.IF "$(GUI)"=="UNX"
-#CONFIGURE_DIR=$(BUILD_DIR)
-
#relative to CONFIGURE_DIR
CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index ffa92f5..c37e34d 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -81,9 +81,6 @@ ADDITIONAL_FILES= \
.IF "$(GUI)"=="WNT"
CRYPTOLIB=mscrypto
-#CRYPTOLIB=nss
-#BASEINC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla;$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla$/nspr;$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla$/nss;$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/external
-#BASELIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
.ELSE
CRYPTOLIB=nss
.ENDIF
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 60e8141..12a3930 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -135,8 +135,6 @@ CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
-#INSTALL_ACTION=$(GNUMAKE) install
-#INSTALL_FLAGS+=DESTDIR=$(PWD)$/$(P_INSTALL_TARGET_DIR)
.ENDIF
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 9066b01..bf42508 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -131,8 +131,6 @@ CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
-#INSTALL_ACTION=$(GNUMAKE) install
-#INSTALL_FLAGS+=DESTDIR=$(PWD)$/$(P_INSTALL_TARGET_DIR)
.ENDIF
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index d7b8002..01652c1 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -135,8 +135,6 @@ CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl
BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
-#INSTALL_ACTION=$(GNUMAKE) install
-#INSTALL_FLAGS+=DESTDIR=$(PWD)$/$(P_INSTALL_TARGET_DIR)
.ENDIF
More information about the Libreoffice-commits
mailing list