mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-09-10 13:03:41 -04:00
111 lines
3.5 KiB
Plaintext
111 lines
3.5 KiB
Plaintext
$NetBSD: patch-aa,v 1.3 2009/11/25 23:31:58 joerg Exp $
|
|
|
|
--- Makefile.in.orig 2008-12-06 05:20:38.000000000 +0100
|
|
+++ Makefile.in
|
|
@@ -30,7 +30,7 @@ DSO = @DSO@
|
|
DSOFLAGS = @DSOFLAGS@
|
|
LDFLAGS = $(OPTIM) $(ARCHFLAGS) @LDFLAGS@
|
|
INSTALL = @INSTALL@
|
|
-LIBMXML = @LIBMXML@
|
|
+LIBMXML = libmxml.la
|
|
LIBS = @LIBS@ @PTHREAD_LIBS@
|
|
LN = @LN@ -s
|
|
MKDIR = @MKDIR@
|
|
@@ -59,10 +59,10 @@ BUILDROOT = $(DSTROOT)
|
|
# Install commands...
|
|
#
|
|
|
|
-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 -s
|
|
+INSTALL_BIN = $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM)
|
|
INSTALL_DATA = $(INSTALL) -m 644
|
|
INSTALL_DIR = $(INSTALL) -d
|
|
-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -m 755
|
|
+INSTALL_LIB = $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB)
|
|
INSTALL_MAN = $(INSTALL) -m 644
|
|
INSTALL_SCRIPT = $(INSTALL) -m 755
|
|
|
|
@@ -133,7 +133,7 @@ clang:
|
|
# Install everything...
|
|
#
|
|
|
|
-install: $(TARGETS) install-$(LIBMXML) install-libmxml.a
|
|
+install: $(TARGETS) install-$(LIBMXML)
|
|
$(INSTALL_DIR) $(BUILDROOT)$(bindir)
|
|
$(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir)
|
|
$(INSTALL_DIR) $(BUILDROOT)$(docdir)
|
|
@@ -149,10 +149,9 @@ install: $(TARGETS) install-$(LIBMXML) i
|
|
$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3
|
|
$(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3
|
|
|
|
-install-libmxml.a:
|
|
+install-libmxml.la:
|
|
$(INSTALL_DIR) $(BUILDROOT)$(libdir)
|
|
- $(INSTALL_LIB) libmxml.a $(BUILDROOT)$(libdir)
|
|
- $(RANLIB) $(BUILDROOT)$(libdir)/libmxml.a
|
|
+ $(INSTALL_LIB) libmxml.la $(BUILDROOT)$(libdir)
|
|
|
|
install-libmxml.so.1.4:
|
|
$(INSTALL_DIR) $(BUILDROOT)$(libdir)
|
|
@@ -242,10 +241,13 @@ config.h: configure config.h.in
|
|
# libmxml.a
|
|
#
|
|
|
|
-libmxml.a: $(LIBOBJS)
|
|
- $(RM) $@
|
|
- $(AR) $(ARFLAGS) $@ $(LIBOBJS)
|
|
- $(RANLIB) $@
|
|
+libmxml.la: $(LIBOBJS:.o=.lo)
|
|
+ ${LIBTOOL} --mode=link ${CC} ${LDFLAGS} ${LIBOBJS:.o=.lo} \
|
|
+ -o libmxml.la -rpath ${PREFIX}/lib -version-info 1:4
|
|
+
|
|
+.SUFFIXES: .lo
|
|
+.c.lo:
|
|
+ ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
|
|
|
|
$(LIBOBJS): mxml.h
|
|
mxml-entity.o mxml-file.o mxml-private.o: mxml-private.h
|
|
@@ -291,7 +293,7 @@ libmxml.1.dylib: $(LIBOBJS)
|
|
#
|
|
|
|
mxmldoc: $(LIBMXML) mxmldoc.o
|
|
- $(CC) -L. $(LDFLAGS) -o $@ mxmldoc.o -lmxml $(LIBS)
|
|
+ ${LIBTOOL} --mode=link $(CC) -L. $(LDFLAGS) -o $@ mxmldoc.o libmxml.la $(LIBS)
|
|
|
|
mxmldoc-static: libmxml.a mxmldoc.o
|
|
$(CC) $(LDFLAGS) -o $@ mxmldoc.o libmxml.a $(LIBS)
|
|
@@ -303,8 +305,8 @@ mxmldoc.o: mxml.h
|
|
# testmxml
|
|
#
|
|
|
|
-testmxml: libmxml.a testmxml.o
|
|
- $(CC) $(LDFLAGS) -o $@ testmxml.o libmxml.a $(LIBS)
|
|
+testmxml: libmxml.la testmxml.o
|
|
+ ${LIBTOOL} --mode=link $(CC) $(LDFLAGS) -o $@ testmxml.o libmxml.la $(LIBS)
|
|
@echo Testing library...
|
|
./testmxml test.xml >temp1.xml 2>temp1s.xml
|
|
./testmxml temp1.xml >temp2.xml 2>temp2s.xml
|
|
@@ -334,9 +336,9 @@ testmxml.o: mxml.h
|
|
# mxml.xml
|
|
#
|
|
|
|
-mxml.xml: mxmldoc-static mxml.h $(PUBLIBOBJS:.o=.c)
|
|
+mxml.xml: mxmldoc mxml.h $(PUBLIBOBJS:.o=.c)
|
|
$(RM) mxml.xml
|
|
- ./mxmldoc-static --header doc/reference.heading mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html
|
|
+ ./mxmldoc --header doc/reference.heading mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html
|
|
if test "x`uname`" = xDarwin; then \
|
|
./mxmldoc-static --docset org.minixml.docset \
|
|
--docversion @VERSION@ --feedname minixml.org \
|
|
@@ -361,9 +363,9 @@ valgrind: mxmldoc-static
|
|
# doc/mxml.man
|
|
#
|
|
|
|
-doc/mxml.man: mxmldoc-static mxml.xml
|
|
+doc/mxml.man: mxmldoc mxml.xml
|
|
$(RM) doc/mxml.man
|
|
- ./mxmldoc-static --man mxml --title "Mini-XML API" \
|
|
+ ./mxmldoc --man mxml --title "Mini-XML API" \
|
|
--intro doc/intro.man --footer doc/footer.man \
|
|
mxml.xml >doc/mxml.man
|
|
|