Wed Mar 14 09:38:33 2018 UTC ()
Xfuncproto.h is a normal file now.


(mrg)
diff -r1.1 -r1.2 src/external/mit/xorg/include/xorgproto/X11/Makefile
cvs diff -r1.1 -r1.2 src/external/mit/xorg/include/xorgproto/X11/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/include/xorgproto/X11/Makefile 2018/03/14 08:55:35 1.1
+++ src/external/mit/xorg/include/xorgproto/X11/Makefile 2018/03/14 09:38:33 1.2
@@ -1,24 +1,19 @@ @@ -1,24 +1,19 @@
1# $NetBSD: Makefile,v 1.1 2018/03/14 08:55:35 mrg Exp $ 1# $NetBSD: Makefile,v 1.2 2018/03/14 09:38:33 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5.PATH: ${X11SRCDIR.xorgproto}/include/X11 5.PATH: ${X11SRCDIR.xorgproto}/include/X11
6 6
7Xfuncproto.h: Xfuncproto.h.in 
8 ${TOOL_SED} -e 's/#undef NARROWPROTO/#define NARROWPROTO/' \ 
9 -e 's/#undef FUNCPROTO/#define FUNCPROTO 15/' \ 
10 < ${.ALLSRC} > ${.TARGET} 
11 
12Xpoll.h: Xpoll.h.in 7Xpoll.h: Xpoll.h.in
13 ${TOOL_SED} 's/@USE_FDS_BITS@/fds_bits/' \ 8 ${TOOL_SED} 's/@USE_FDS_BITS@/fds_bits/' \
14 < ${.ALLSRC} > ${.TARGET} 9 < ${.ALLSRC} > ${.TARGET}
15 10
16INCS= DECkeysym.h \ 11INCS= DECkeysym.h \
17 HPkeysym.h \ 12 HPkeysym.h \
18 Sunkeysym.h \ 13 Sunkeysym.h \
19 X.h \ 14 X.h \
20 XF86keysym.h \ 15 XF86keysym.h \
21 XWDFile.h \ 16 XWDFile.h \
22 Xalloca.h \ 17 Xalloca.h \
23 Xarch.h \ 18 Xarch.h \
24 Xatom.h \ 19 Xatom.h \
@@ -31,21 +26,22 @@ INCS= DECkeysym.h \ @@ -31,21 +26,22 @@ INCS= DECkeysym.h \
31 Xosdefs.h \ 26 Xosdefs.h \
32 Xpoll.h \ 27 Xpoll.h \
33 Xproto.h \ 28 Xproto.h \
34 Xprotostr.h \ 29 Xprotostr.h \
35 Xthreads.h \ 30 Xthreads.h \
36 Xw32defs.h \ 31 Xw32defs.h \
37 Xwindows.h \ 32 Xwindows.h \
38 Xwinsock.h \ 33 Xwinsock.h \
39 ap_keysym.h \ 34 ap_keysym.h \
40 keysym.h \ 35 keysym.h \
41 keysymdef.h 36 keysymdef.h
42INCSDIR=${X11INCDIR}/X11 37INCSDIR=${X11INCDIR}/X11
43 38
44CLEANFILES+= Xpoll.h Xfuncproto.h 39CLEANFILES+= Xpoll.h
45 40
46NOOBJ= # defined 41NOOBJ= # defined
47 42
48SUBDIR= PM dri extensions fonts 43SUBDIR= PM dri extensions fonts
49 44
50.include <bsd.x11.mk> 45.include <bsd.x11.mk>
 46.include <bsd.prog.mk>
51.include <bsd.subdir.mk> 47.include <bsd.subdir.mk>