Merge branch 'upstream'

[pkg/netris.git] / Makefile

diff --git a/Makefile b/Makefile
index 76692f2e8b25d11453545a8e0d2ede5f61634e51..83359e0bac4ef5ec7fb2c0428578100822208777 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ CC = gcc
 COPT = -O2
 CEXTRA = -DNDEBUG
 LEXTRA = 
-LFLAGS =   -lnsl -lncurses
+LFLAGS =  -lncurses -lnsl
 CFLAGS = $(CEXTRA) $(COPT)
 
 PROG = netris
@@ -76,124 +76,168 @@ game.o: game.c netris.h config.h /usr/include/getopt.h \
  /usr/include/memory.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
  /usr/include/string.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/timebits.h \
- /usr/include/gnu/types.h /usr/include/sys/select.h \
- /usr/include/selectbits.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
+ /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/bits/types.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/sigset.h \
+ /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
  /usr/include/libio.h /usr/include/_G_config.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stdarg.h \
- /usr/include/stdio_lim.h /usr/include/signal.h /usr/include/sigset.h \
- /usr/include/signum.h /usr/include/sigaction.h \
- /usr/include/sigcontext.h /usr/include/asm/sigcontext.h proto.chg \
+ /usr/include/bits/stdio_lim.h /usr/include/signal.h \
+ /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
+ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
+ /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/alloca.h /usr/include/ctype.h \
- /usr/include/netinet/in.h /usr/include/sys/socket.h \
- /usr/include/socketbits.h /usr/include/sockaddrcom.h \
- /usr/include/asm/socket.h /usr/include/asm/sockios.h
+ /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
+ /usr/include/alloca.h /usr/include/ctype.h /usr/include/netinet/in.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/limits.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/syslimits.h \
+ /usr/include/limits.h /usr/include/bits/posix1_lim.h \
+ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
+ /usr/include/bits/posix2_lim.h /usr/include/stdint.h \
+ /usr/include/bits/wordsize.h /usr/include/bits/socket.h \
+ /usr/include/bits/sockaddr.h /usr/include/asm/socket.h \
+ /usr/include/asm/sockios.h /usr/include/bits/in.h \
+ /usr/include/bits/byteswap.h
 curses.o: curses.c netris.h config.h /usr/include/getopt.h \
  /usr/include/memory.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
  /usr/include/string.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/timebits.h \
- /usr/include/gnu/types.h /usr/include/sys/select.h \
- /usr/include/selectbits.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
+ /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/bits/types.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/sigset.h \
+ /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
  /usr/include/libio.h /usr/include/_G_config.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stdarg.h \
- /usr/include/stdio_lim.h /usr/include/signal.h /usr/include/sigset.h \
- /usr/include/signum.h /usr/include/sigaction.h \
- /usr/include/sigcontext.h /usr/include/asm/sigcontext.h proto.chg \
- /usr/include/sys/types.h /usr/include/endian.h /usr/include/bytesex.h \
- /usr/include/unistd.h /usr/include/posix_opt.h \
- /usr/include/confname.h /usr/include/curses.h /usr/include/unctrl.h \
- /usr/include/stdlib.h /usr/include/alloca.h
+ /usr/include/bits/stdio_lim.h /usr/include/signal.h \
+ /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
+ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
+ /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
+ /usr/include/sys/types.h /usr/include/endian.h \
+ /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
+ /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+ /usr/include/bits/confname.h /usr/include/curses.h \
+ /usr/include/unctrl.h /usr/include/stdlib.h /usr/include/alloca.h
 shapes.o: shapes.c netris.h config.h /usr/include/getopt.h \
  /usr/include/memory.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
  /usr/include/string.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/timebits.h \
- /usr/include/gnu/types.h /usr/include/sys/select.h \
- /usr/include/selectbits.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
+ /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/bits/types.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/sigset.h \
+ /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
  /usr/include/libio.h /usr/include/_G_config.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stdarg.h \
- /usr/include/stdio_lim.h /usr/include/signal.h /usr/include/sigset.h \
- /usr/include/signum.h /usr/include/sigaction.h \
- /usr/include/sigcontext.h /usr/include/asm/sigcontext.h proto.chg \
+ /usr/include/bits/stdio_lim.h /usr/include/signal.h \
+ /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
+ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
+ /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/alloca.h
+ /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
+ /usr/include/alloca.h
 board.o: board.c netris.h config.h /usr/include/getopt.h \
  /usr/include/memory.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
  /usr/include/string.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/timebits.h \
- /usr/include/gnu/types.h /usr/include/sys/select.h \
- /usr/include/selectbits.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
+ /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/bits/types.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/sigset.h \
+ /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
  /usr/include/libio.h /usr/include/_G_config.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stdarg.h \
- /usr/include/stdio_lim.h /usr/include/signal.h /usr/include/sigset.h \
- /usr/include/signum.h /usr/include/sigaction.h \
- /usr/include/sigcontext.h /usr/include/asm/sigcontext.h proto.chg \
+ /usr/include/bits/stdio_lim.h /usr/include/signal.h \
+ /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
+ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
+ /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/alloca.h
+ /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
+ /usr/include/alloca.h
 util.o: util.c netris.h config.h /usr/include/getopt.h \
  /usr/include/memory.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
  /usr/include/string.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/timebits.h \
- /usr/include/gnu/types.h /usr/include/sys/select.h \
- /usr/include/selectbits.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
+ /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/bits/types.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/sigset.h \
+ /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
  /usr/include/libio.h /usr/include/_G_config.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stdarg.h \
- /usr/include/stdio_lim.h /usr/include/signal.h /usr/include/sigset.h \
- /usr/include/signum.h /usr/include/sigaction.h \
- /usr/include/sigcontext.h /usr/include/asm/sigcontext.h proto.chg \
+ /usr/include/bits/stdio_lim.h /usr/include/signal.h \
+ /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
+ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
+ /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/endian.h \
- /usr/include/bytesex.h /usr/include/alloca.h /usr/include/unistd.h \
- /usr/include/posix_opt.h /usr/include/confname.h /usr/include/netdb.h \
- /usr/include/rpc/netdb.h /usr/include/errno.h /usr/include/errnos.h \
+ /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
+ /usr/include/alloca.h /usr/include/unistd.h \
+ /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
+ /usr/include/netdb.h /usr/include/rpc/netdb.h \
+ /usr/include/sys/socket.h /usr/include/bits/socket.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/limits.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/syslimits.h \
+ /usr/include/limits.h /usr/include/bits/posix1_lim.h \
+ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
+ /usr/include/bits/posix2_lim.h /usr/include/bits/sockaddr.h \
+ /usr/include/asm/socket.h /usr/include/asm/sockios.h \
+ /usr/include/errno.h /usr/include/bits/errno.h \
  /usr/include/linux/errno.h /usr/include/asm/errno.h
 inet.o: inet.c netris.h config.h /usr/include/getopt.h \
  /usr/include/memory.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
  /usr/include/string.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/timebits.h \
- /usr/include/gnu/types.h /usr/include/sys/select.h \
- /usr/include/selectbits.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
+ /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/bits/types.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/sigset.h \
+ /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
  /usr/include/libio.h /usr/include/_G_config.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stdarg.h \
- /usr/include/stdio_lim.h /usr/include/signal.h /usr/include/sigset.h \
- /usr/include/signum.h /usr/include/sigaction.h \
- /usr/include/sigcontext.h /usr/include/asm/sigcontext.h proto.chg \
- /usr/include/sys/types.h /usr/include/endian.h /usr/include/bytesex.h \
- /usr/include/unistd.h /usr/include/posix_opt.h \
- /usr/include/confname.h /usr/include/stdlib.h /usr/include/alloca.h \
- /usr/include/sys/socket.h /usr/include/socketbits.h \
- /usr/include/sockaddrcom.h /usr/include/asm/socket.h \
- /usr/include/asm/sockios.h /usr/include/netinet/in.h \
- /usr/include/netdb.h /usr/include/rpc/netdb.h /usr/include/errno.h \
- /usr/include/errnos.h /usr/include/linux/errno.h \
+ /usr/include/bits/stdio_lim.h /usr/include/signal.h \
+ /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
+ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
+ /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
+ /usr/include/sys/types.h /usr/include/endian.h \
+ /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
+ /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+ /usr/include/bits/confname.h /usr/include/stdlib.h \
+ /usr/include/alloca.h /usr/include/sys/socket.h \
+ /usr/include/bits/socket.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/limits.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/syslimits.h \
+ /usr/include/limits.h /usr/include/bits/posix1_lim.h \
+ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
+ /usr/include/bits/posix2_lim.h /usr/include/bits/sockaddr.h \
+ /usr/include/asm/socket.h /usr/include/asm/sockios.h \
+ /usr/include/netinet/in.h /usr/include/stdint.h \
+ /usr/include/bits/wordsize.h /usr/include/bits/in.h \
+ /usr/include/bits/byteswap.h /usr/include/netdb.h \
+ /usr/include/rpc/netdb.h /usr/include/errno.h \
+ /usr/include/bits/errno.h /usr/include/linux/errno.h \
  /usr/include/asm/errno.h
 robot.o: robot.c netris.h config.h /usr/include/getopt.h \
  /usr/include/memory.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
  /usr/include/string.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/timebits.h \
- /usr/include/gnu/types.h /usr/include/sys/select.h \
- /usr/include/selectbits.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
+ /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/bits/types.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/sigset.h \
+ /usr/include/assert.h /usr/include/stdio.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
  /usr/include/libio.h /usr/include/_G_config.h \
- /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stdarg.h \
- /usr/include/stdio_lim.h /usr/include/signal.h /usr/include/sigset.h \
- /usr/include/signum.h /usr/include/sigaction.h \
- /usr/include/sigcontext.h /usr/include/asm/sigcontext.h proto.chg \
- /usr/include/unistd.h /usr/include/posix_opt.h \
- /usr/include/confname.h /usr/include/stdlib.h \
- /usr/include/sys/types.h /usr/include/endian.h /usr/include/bytesex.h \
+ /usr/include/bits/stdio_lim.h /usr/include/signal.h \
+ /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
+ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
+ /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
+ /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+ /usr/include/bits/confname.h /usr/include/stdlib.h \
+ /usr/include/sys/types.h /usr/include/endian.h \
+ /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
  /usr/include/alloca.h /usr/include/ctype.h /usr/include/fcntl.h \
- /usr/include/fcntlbits.h /usr/include/errno.h /usr/include/errnos.h \
- /usr/include/linux/errno.h /usr/include/asm/errno.h
+ /usr/include/bits/fcntl.h /usr/include/errno.h \
+ /usr/include/bits/errno.h /usr/include/linux/errno.h \
+ /usr/include/asm/errno.h
 version.o: version.c