46 lines
1.6 KiB
Text
46 lines
1.6 KiB
Text
$NetBSD: patch-aa,v 1.5 2009/11/09 13:29:53 joerg Exp $
|
|
|
|
--- Makefile.common.orig 2007-07-13 02:32:20.000000000 +0200
|
|
+++ Makefile.common
|
|
@@ -28,15 +28,15 @@ GCC_CXX_WARNINGS = $(GCC_WARNINGS) -Wove
|
|
# assertion and crash the program if it isn't really true. You can add
|
|
# -UNDEBUG (in any of various ways) to override this.
|
|
#
|
|
-CFLAGS_COMMON = -DNDEBUG
|
|
-CXXFLAGS_COMMON = -DNDEBUG
|
|
+CFLAGS_COMMON += -DNDEBUG
|
|
+CXXFLAGS_COMMON += -DNDEBUG
|
|
|
|
ifeq ($(C_COMPILER_GNU),yes)
|
|
- CFLAGS_COMMON += $(GCC_C_WARNINGS) -fno-common -g -O3
|
|
+ CFLAGS_COMMON += $(GCC_C_WARNINGS) -fno-common
|
|
endif
|
|
|
|
ifeq ($(CXX_COMPILER_GNU),yes)
|
|
- CXXFLAGS_COMMON += $(GCC_CXX_WARNINGS) -g
|
|
+ CXXFLAGS_COMMON += $(GCC_CXX_WARNINGS)
|
|
endif
|
|
|
|
DISTDIR = $(BUILDDIR)/$(PACKAGE)-$(VERSION)/$(SUBDIR)
|
|
@@ -116,10 +116,8 @@ ifneq ($(ENABLE_LIBXML2_BACKEND),yes)
|
|
# We're using the internal Expat XML parser
|
|
LIBXMLRPC_XML = $(LIBXMLRPC_XMLPARSE) $(LIBXMLRPC_XMLTOK)
|
|
LDLIBS_XML = \
|
|
- -L$(BUILDDIR)/lib/expat/xmlparse/.libs \
|
|
- -lxmlrpc_xmlparse \
|
|
- -L$(BUILDDIR)/lib/expat/xmltok/.libs \
|
|
- -lxmlrpc_xmltok
|
|
+ $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la \
|
|
+ $(BUILDDIR)/lib/expat/xmltok/libxmlrpc_xmltok.la
|
|
else
|
|
LDLIBS_XML = $(shell xml2-config --libs)
|
|
endif
|
|
@@ -334,7 +332,7 @@ install-headers: $(HEADERS_TO_INSTALL)
|
|
done
|
|
|
|
|
|
-INSTALL_PROGRAM_CMD = $(INSTALL_PROGRAM) $$p $(DESTDIR)$(PROGRAMINST_DIR)/$$p
|
|
+INSTALL_PROGRAM_CMD = libtool --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(PROGRAMINST_DIR)/$$p
|
|
|
|
install-bin: $(PROGRAMS_TO_INSTALL) $(DESTDIR)$(PROGRAMINST_DIR)
|
|
@list='$(PROGRAMS_TO_INSTALL)'; \
|