Generate the proper .lo files needed by the new libtool (libtool-ml).

This should compile again.

1 files changed, 35 insertions, 27 deletions

diff --git a/x11/xforms/files/Makefile b/x11/xforms/files/Makefile
index 2f100869e42..cf83ce55ebf 100644
--- a/x11/xforms/files/Makefile
+++ b/x11/xforms/files/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/08/15 14:29:13 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/03/02 01:26:12 jlam Exp $
 #
 # Makefile using LIBTOOL to generate a shared library from the static one.
 
@@ -18,53 +18,61 @@ MAN5=		FORMS/xforms.5
 all:		libforms.la
 
 libforms.la:	FORMS/libforms.a
-	mkdir -p objects
-	cd objects; \
-	${AR} x ../FORMS/libforms.a; \
-	for file in *.o; do \
-		ln -f $${file} $${file%.o}.lo; \
+	mkdir -p objects/.libs;						\
+	cd objects/.libs;						\
+	${AR} x ../../FORMS/libforms.a;					\
+	cd ..;								\
+	for file in .libs/*.o; do					\
+		base=`basename $${file} .o`;				\
+		rm -f $${base}.lo;					\
+		( echo "#";						\
+		  echo "# Generated by libtool";			\
+		  echo "#";						\
+		  echo "pic_object=$${file}";				\
+		  echo "non_pic_object=$${file}";			\
+		) > $${base}.lo;					\
 	done
-	${LIBTOOL} --mode=link ${CC} -o ${.TARGET} objects/*.lo \
+	${LIBTOOL} --mode=link ${CC} -o ${.TARGET} objects/*.lo		\
 		-rpath ${LIBDIR} -version-info ${SHLIB_MAJOR}:${SHLIB_MINOR}
 
 install:	install-progs install-includes install-libs install-man
 
 install-progs:	${PROGS}
-	@for file in ${PROGS}; do \
-		echo "${BSD_INSTALL_PROGRAM} $$file ${BINDIR}"; \
-		${BSD_INSTALL_PROGRAM} $$file ${BINDIR}; \
+	@for file in ${PROGS}; do					\
+		echo "${BSD_INSTALL_PROGRAM} $$file ${BINDIR}";		\
+		${BSD_INSTALL_PROGRAM} $$file ${BINDIR};		\
 	done
 
 install-includes:	${INCLUDES}
-	@for file in ${INCLUDES}; do \
-		echo "${BSD_INSTALL_MAN} $$file ${INCLUDEDIR}"; \
-		${BSD_INSTALL_MAN} $$file ${INCLUDEDIR}; \
+	@for file in ${INCLUDES}; do					\
+		echo "${BSD_INSTALL_MAN} $$file ${INCLUDEDIR}";		\
+		${BSD_INSTALL_MAN} $$file ${INCLUDEDIR};		\
 	done
 
 install-libs:	libforms.la
 	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libforms.la ${LIBDIR}
-	@if [ -f ${LIBDIR}/libforms.a ]; then \
-		echo "ln -sf libforms.a ${LIBDIR}/libxforms.a"; \
-		ln -sf libforms.a ${LIBDIR}/libxforms.a; \
+	@if [ -f ${LIBDIR}/libforms.a ]; then				\
+		echo "ln -sf libforms.a ${LIBDIR}/libxforms.a";		\
+		ln -sf libforms.a ${LIBDIR}/libxforms.a;		\
 	fi
-	@if [ -f ${LIBDIR}/libforms.la ]; then \
-		echo "ln -sf libforms.la ${LIBDIR}/libxforms.la"; \
-		ln -sf libforms.la ${LIBDIR}/libxforms.la; \
+	@if [ -f ${LIBDIR}/libforms.la ]; then				\
+		echo "ln -sf libforms.la ${LIBDIR}/libxforms.la";	\
+		ln -sf libforms.la ${LIBDIR}/libxforms.la;		\
 	fi
 	@if [ -f ${LIBDIR}/libforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ]; then \
-		echo "ln -sf libforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+		echo "ln -sf libforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR}	\
 			${LIBDIR}/libxforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR}"; \
-		ln -sf libforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+		ln -sf libforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR}	\
 			${LIBDIR}/libxforms.so.${SHLIB_MAJOR}.${SHLIB_MINOR}; \
 	fi
 
 install-man:	${MAN1} ${MAN5}
-	@for file in ${MAN1}; do \
-		echo "${BSD_INSTALL_MAN} $$file ${MANDIR}/man1"; \
-		${BSD_INSTALL_MAN} $$file ${MANDIR}/man1; \
+	@for file in ${MAN1}; do					\
+		echo "${BSD_INSTALL_MAN} $$file ${MANDIR}/man1";	\
+		${BSD_INSTALL_MAN} $$file ${MANDIR}/man1;		\
 	done
-	@for file in ${MAN5}; do \
-		echo "${BSD_INSTALL_MAN} $$file ${MANDIR}/man5"; \
-		${BSD_INSTALL_MAN} $$file ${MANDIR}/man5; \
+	@for file in ${MAN5}; do					\
+		echo "${BSD_INSTALL_MAN} $$file ${MANDIR}/man5";	\
+		${BSD_INSTALL_MAN} $$file ${MANDIR}/man5;		\
 	done
 	ln -sf xforms.5 ${MANDIR}/man5/forms.5