diff --git a/src/libraries/libisc-new/src/Makefile b/src/libraries/libisc-new/src/Makefile
index a9db699b62ac37a4aa18ef82ee84e1ed623b2146..5aaac806fb6e1920977bf5a0d61d51293a1355f4 100644
--- a/src/libraries/libisc-new/src/Makefile
+++ b/src/libraries/libisc-new/src/Makefile
@@ -4,147 +4,58 @@
# Copyright (c) 1992 Peter Eriksson and Per Cederqvist of the
# Lysator Academic Computer Association.
#
-INSTROOT=/usr/local
#
-LIBDIR=$(INSTROOT)/lib
-INCDIR=$(INSTROOT)/include
#
-INCLUDES=-I$(HOME)/include -I/usr/local/include
-CC=gcc
-CFLAGS=-g -O -I. -pipe -Wall -ansi $(INCLUDES)
#
+include Topdir.make
+SCRIPTDIR = $(TOPDIR)/scripts
+
+include $(SCRIPTDIR)/import.make
+
+
SOURCES=isc_event.c isc_session.c isc_abort.c isc_alloc.c isc_master.c\
isc_output.c isc_queue.c isc_message.c isc_handler.c\
isc_stdout.c isc_socket.c isc_tcp.c isc_udp.c printf.c
-OBJECTS=isc_event.o isc_session.o isc_abort.o isc_alloc.o isc_master.o\
+LIBOBJS=isc_event.o isc_session.o isc_abort.o isc_alloc.o isc_master.o\
isc_output.o isc_queue.o isc_message.o isc_handler.o\
isc_stdout.o isc_socket.o isc_tcp.o isc_udp.o printf.o
-all: libisc.a
+LIBNAME = libisc-new$(PROFILE-LIB-SUFFIX).a
+
+INSTALL-HDRS = isc.h
+
+all: $(LIBNAME)
+
+binaries:;
-install: $(LIBDIR)/libisc.a $(INCDIR)/isc.h
+libraries: $(LIBDIR)/$(LIBNAME)
-$(LIBDIR)/libisc.a: libisc.a
- cp libisc.a $(LIBDIR)
- ranlib $(LIBDIR)/libisc.a
+includes:
+ ( cmp isc.h $(INCLUDEDIR)/isc-new.h 2>/dev/null ) \
+ || ( $(RM) $(INCLUDEDIR)/isc-new.h; \
+ cp isc.h $(INCLUDEDIR)/isc-new.h; \
+ chmod a-w $(INCLUDEDIR)/isc-new.h ) \
-$(INCDIR)/isc.h: isc.h
- cp isc.h $(INCDIR)
+$(LIBDIR)/$(LIBNAME): $(LIBNAME)
+ $(RM) $(LIBDIR)/$(LIBNAME)
+ cp $(LIBNAME) $(LIBDIR)/$(LIBNAME)
+ $(TOUCHLIB) $(LIBDIR)/$(LIBNAME)
tags:
etags -t *.[hc]
-depend:
- gmkdep $(INCLUDES) $(SOURCES)
-
clean:
- rm -f *~ *.o libisc.a core \#*\#
-
-
-libisc.a: $(OBJECTS)
- touch libisc.a
- rm -f libisc.a
- ar q libisc.a $(OBJECTS)
- ranlib libisc.a
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-isc_event.o : isc_event.c /usr/include/stdio.h \
- /usr/gnu/lib/gcc-include/stdarg.h /usr/local/include/stdlib.h \
- /usr/include/time.h /usr/include/sys/stdtypes.h /usr/include/sys/types.h \
- /usr/include/sys/sysmacros.h /usr/include/sys/time.h /usr/include/errno.h \
- /usr/include/sys/errno.h /home/kolix2/elev/d89/d89peter/include/stddef.h \
- /usr/include/string.h isc.h /usr/include/sys/socket.h intern.h
-isc_session.o : isc_session.c /usr/include/sys/types.h \
- /usr/include/sys/stdtypes.h /usr/include/sys/sysmacros.h \
- /usr/include/errno.h /usr/include/sys/errno.h /usr/local/include/stdlib.h \
- /home/kolix2/elev/d89/d89peter/include/stddef.h /usr/include/string.h \
- /usr/include/fcntl.h /usr/include/sys/fcntlcom.h /usr/include/sys/stat.h \
- isc.h /usr/include/time.h /usr/gnu/lib/gcc-include/stdarg.h \
- /usr/include/sys/socket.h intern.h
-isc_abort.o : isc_abort.c /usr/include/stdio.h /usr/local/include/stdlib.h \
- /home/kolix2/elev/d89/d89peter/include/stddef.h /usr/include/sys/stdtypes.h \
- isc.h /usr/include/time.h /usr/gnu/lib/gcc-include/stdarg.h \
- /usr/include/sys/types.h /usr/include/sys/sysmacros.h \
- /usr/include/sys/socket.h intern.h
-isc_alloc.o : isc_alloc.c /usr/local/include/stdlib.h \
- /home/kolix2/elev/d89/d89peter/include/stddef.h /usr/include/sys/stdtypes.h \
- /usr/include/string.h isc.h /usr/include/time.h \
- /usr/gnu/lib/gcc-include/stdarg.h /usr/include/sys/types.h \
- /usr/include/sys/sysmacros.h /usr/include/sys/socket.h intern.h
-isc_master.o : isc_master.c /usr/include/errno.h /usr/include/sys/errno.h \
- /usr/local/include/stdlib.h /home/kolix2/elev/d89/d89peter/include/stddef.h \
- /usr/include/sys/stdtypes.h /usr/include/sys/file.h \
- /usr/include/sys/types.h /usr/include/sys/sysmacros.h \
- /usr/include/sys/fcntlcom.h /usr/include/sys/stat.h isc.h \
- /usr/include/time.h /usr/gnu/lib/gcc-include/stdarg.h \
- /usr/include/sys/socket.h intern.h
-isc_output.o : isc_output.c /usr/local/include/stdlib.h \
- /home/kolix2/elev/d89/d89peter/include/stddef.h /usr/include/sys/stdtypes.h \
- /usr/include/errno.h /usr/include/sys/errno.h /usr/include/string.h \
- /usr/include/sys/file.h /usr/include/sys/types.h \
- /usr/include/sys/sysmacros.h /usr/include/sys/fcntlcom.h \
- /usr/include/sys/stat.h isc.h /usr/include/time.h \
- /usr/gnu/lib/gcc-include/stdarg.h /usr/include/sys/socket.h intern.h
-isc_queue.o : isc_queue.c /usr/local/include/stdlib.h \
- /home/kolix2/elev/d89/d89peter/include/stddef.h /usr/include/sys/stdtypes.h \
- isc.h /usr/include/time.h /usr/gnu/lib/gcc-include/stdarg.h \
- /usr/include/sys/types.h /usr/include/sys/sysmacros.h \
- /usr/include/sys/socket.h intern.h
-isc_message.o : isc_message.c /usr/local/include/stdlib.h \
- /home/kolix2/elev/d89/d89peter/include/stddef.h /usr/include/sys/stdtypes.h \
- /usr/include/string.h isc.h /usr/include/time.h \
- /usr/gnu/lib/gcc-include/stdarg.h /usr/include/sys/types.h \
- /usr/include/sys/sysmacros.h /usr/include/sys/socket.h intern.h
-isc_stdout.o : isc_stdout.c /usr/gnu/lib/gcc-include/stdarg.h \
- /usr/include/string.h /usr/include/sys/stdtypes.h isc.h /usr/include/time.h \
- /usr/include/sys/types.h /usr/include/sys/sysmacros.h \
- /usr/include/sys/socket.h
-isc_socket.o : isc_socket.c /usr/include/stdio.h \
- /usr/gnu/lib/gcc-include/stdarg.h /usr/local/include/stdlib.h \
- /usr/include/time.h /usr/include/sys/stdtypes.h /usr/include/sys/types.h \
- /usr/include/sys/sysmacros.h /usr/include/sys/time.h \
- /usr/include/netinet/in.h /usr/include/sys/socket.h \
- /usr/local/include/arpa/inet.h /usr/include/sys/file.h \
- /usr/include/sys/fcntlcom.h /usr/include/sys/stat.h \
- /usr/include/sys/ioctl.h /usr/gnu/lib/gcc-include/sys/ttychars.h \
- /usr/include/sys/ttydev.h /usr/gnu/lib/gcc-include/sys/ttold.h \
- /usr/gnu/lib/gcc-include/sys/ioccom.h /usr/gnu/lib/gcc-include/sys/ttycom.h \
- /usr/gnu/lib/gcc-include/sys/filio.h /usr/gnu/lib/gcc-include/sys/sockio.h \
- /usr/include/errno.h /usr/include/sys/errno.h /usr/local/include/netdb.h \
- /home/kolix2/elev/d89/d89peter/include/stddef.h /usr/include/string.h \
- /usr/include/fcntl.h isc.h intern.h
-isc_tcp.o : isc_tcp.c /usr/include/errno.h /usr/include/sys/errno.h \
- /usr/local/include/stdlib.h /home/kolix2/elev/d89/d89peter/include/stddef.h \
- /usr/include/sys/stdtypes.h /usr/include/ctype.h /usr/include/sys/types.h \
- /usr/include/sys/sysmacros.h /usr/include/sys/socket.h \
- /usr/include/netinet/in.h /usr/local/include/arpa/inet.h \
- /usr/include/sys/file.h /usr/include/sys/fcntlcom.h /usr/include/sys/stat.h \
- /usr/include/sys/ioctl.h /usr/gnu/lib/gcc-include/sys/ttychars.h \
- /usr/include/sys/ttydev.h /usr/gnu/lib/gcc-include/sys/ttold.h \
- /usr/gnu/lib/gcc-include/sys/ioccom.h /usr/gnu/lib/gcc-include/sys/ttycom.h \
- /usr/gnu/lib/gcc-include/sys/filio.h /usr/gnu/lib/gcc-include/sys/sockio.h \
- /usr/local/include/netdb.h /usr/include/string.h /usr/include/fcntl.h isc.h \
- /usr/include/time.h /usr/gnu/lib/gcc-include/stdarg.h intern.h
-isc_udp.o : isc_udp.c /usr/include/sys/types.h /usr/include/sys/stdtypes.h \
- /usr/include/sys/sysmacros.h /usr/include/errno.h /usr/include/sys/errno.h \
- /usr/local/include/stdlib.h /home/kolix2/elev/d89/d89peter/include/stddef.h \
- /usr/include/ctype.h /usr/include/netinet/in.h /usr/include/sys/socket.h \
- /usr/local/include/arpa/inet.h /usr/include/sys/file.h \
- /usr/include/sys/fcntlcom.h /usr/include/sys/stat.h \
- /usr/include/sys/ioctl.h /usr/gnu/lib/gcc-include/sys/ttychars.h \
- /usr/include/sys/ttydev.h /usr/gnu/lib/gcc-include/sys/ttold.h \
- /usr/gnu/lib/gcc-include/sys/ioccom.h /usr/gnu/lib/gcc-include/sys/ttycom.h \
- /usr/gnu/lib/gcc-include/sys/filio.h /usr/gnu/lib/gcc-include/sys/sockio.h \
- /usr/local/include/netdb.h /usr/include/string.h /usr/include/fcntl.h isc.h \
- /usr/include/time.h /usr/gnu/lib/gcc-include/stdarg.h intern.h
-printf.o : printf.c /usr/include/sys/types.h /usr/include/sys/stdtypes.h \
- /usr/include/sys/sysmacros.h /usr/gnu/lib/gcc-include/varargs.h \
- /usr/gnu/lib/gcc-include/va-sparc.h /usr/include/stdio.h \
- /usr/include/ctype.h /usr/include/string.h /usr/local/include/stdlib.h \
- /usr/include/math.h /usr/include/floatingpoint.h /usr/include/sys/ieeefp.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+ $(RM) ${OBJECTS} $(GENERIC-CLEAN) Distfile testnumlist
+
+distclean: clean
+ $(RM) $(GENERIC-DIST-CLEAN)
+
+include $(SCRIPTDIR)/Single-depend.make
+
+include dependencies
+
+$(LIBNAME): $(LIBOBJS)
+ $(AR) $(ARFLAGS) $(LIBNAME) $?
+ $(RANLIB) $(LIBNAME)