[peace-changes] peace/lib Makefile,1.16,1.17 makelib.sh,1.8,1.9

[TAMURA K. <tk...@us...>]

Update of /cvsroot/peace/peace/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20785

Modified Files:
	Makefile makelib.sh 
Log Message:
* silence makelib.sh
* compile crts for exe


Index: makelib.sh
===================================================================
RCS file: /cvsroot/peace/peace/lib/makelib.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- makelib.sh	1 Dec 2003 14:54:24 -0000	1.8
+++ makelib.sh	30 Jun 2006 13:02:57 -0000	1.9
@@ -39,9 +39,9 @@
 	def=$dllbase.def
 
 	if [ $dllbase.a -nt $lib ]; then
-		echo "$dllbase.a is newer than $lib.  Skip it."
 		continue;
 	fi
+	echo "Generating $dllbase.a"
 	test $verbose = yes && echo writing $def
 	echo "EXPORTS" > $def
 

Index: Makefile
===================================================================
RCS file: /cvsroot/peace/peace/lib/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	30 Jun 2006 03:21:34 -0000	1.16
+++ Makefile	30 Jun 2006 13:02:57 -0000	1.17
@@ -13,32 +13,38 @@
 IMPLIBS=	libc.a libm.a libz.a libpthread.a libstdc++.a \
 		libX11.a libXext.a libfreetype.a libicuuc.a \
 		libicui18n.a ${ICUIO}.a
-LIBS=		libuuid.a libdxguid.a libpeasu.a
+LIBS=		libuuid.a libdxguid.a libpeasu.a crt0exe.o crt0exewin.o
 CPPFLAGS+=	-I../dist/w32api/include
+RTLDINC=	-I../libexec/ld.pe_so
 CLEANFILES+=	${IMPLIBS} ${IMPLIBS:S/.a$/.def/} ${LIBS}
 
 .PATH: ../dist/w32api/lib
 .PATH: ../dist/w32api/lib/directx
+.PATH: ./csu/arch/${MACHINE_ARCH}
 .MAIN: all
 all: ${LIBS}
-	${MAKELIB} ${MAKELIBFLAGS} /lib/libc.so
-	${MAKELIB} ${MAKELIBFLAGS} /lib/libm.so
-	${MAKELIB} ${MAKELIBFLAGS} /lib/libz.so
-	${MAKELIB} ${MAKELIBFLAGS} /usr/lib/libpthread.so
-	${MAKELIB} ${MAKELIBFLAGS} -o "(__terminate|__get_eh_context|__sjthrow|_GLOBAL)" /usr/lib/libstdc++.so
-	${MAKELIB} ${MAKELIBFLAGS} ${X11LIBPATH}/libX11.so
-	${MAKELIB} ${MAKELIBFLAGS} ${X11LIBPATH}/libXext.so
-	${MAKELIB} ${MAKELIBFLAGS} ${LOCALBASE}/lib/libfreetype.so
-	${MAKELIB} ${MAKELIBFLAGS} ${LOCALBASE}/lib/libicuuc.so
-	${MAKELIB} ${MAKELIBFLAGS} ${LOCALBASE}/lib/libicui18n.so
-	${MAKELIB} ${MAKELIBFLAGS} ${LOCALBASE}/lib/${ICUIO}.so
+	@${MAKELIB} ${MAKELIBFLAGS} /lib/libc.so
+	@${MAKELIB} ${MAKELIBFLAGS} /lib/libm.so
+	@${MAKELIB} ${MAKELIBFLAGS} /lib/libz.so
+	@${MAKELIB} ${MAKELIBFLAGS} /usr/lib/libpthread.so
+	@${MAKELIB} ${MAKELIBFLAGS} -o "(__terminate|__get_eh_context|__sjthrow|_GLOBAL)" /usr/lib/libstdc++.so
+	@${MAKELIB} ${MAKELIBFLAGS} ${X11LIBPATH}/libX11.so
+	@${MAKELIB} ${MAKELIBFLAGS} ${X11LIBPATH}/libXext.so
+	@${MAKELIB} ${MAKELIBFLAGS} ${LOCALBASE}/lib/libfreetype.so
+	@${MAKELIB} ${MAKELIBFLAGS} ${LOCALBASE}/lib/libicuuc.so
+	@${MAKELIB} ${MAKELIBFLAGS} ${LOCALBASE}/lib/libicui18n.so
+	@${MAKELIB} ${MAKELIBFLAGS} ${LOCALBASE}/lib/${ICUIO}.so
 
 libuuid.a: uuid.o
-	${AR} rc $@ uuid.o
+	${AR} rc $@  ${.ALLSRC}
 libdxguid.a: dxguid.o
-	${AR} rc $@ dxguid.o
+	${AR} rc $@  ${.ALLSRC}
 libpeasu.a: dllmain.o
-	${AR} rc $@ dllmain.o
+	${AR} rc $@  ${.ALLSRC}
+crt0exe.o: crt0exe.c
+	${CC} ${RTLDINC} ${CPPFLAGS} ${CFLAGS} -o $@ -c  ${.ALLSRC}
+crt0exewin.o: crt0exe.c
+	${CC} -DWINDOWS_SUBSYSTEM ${RTLDINC} ${CPPFLAGS} ${CFLAGS} -o $@ -c ${.ALLSRC}
 
 clean:
 	rm -f ${CLEANFILES}