Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-3]: src/x11/Xserver/afb Pull up revision 1.7 (requested by tron i...



details:   https://anonhg.NetBSD.org/src/rev/7911779554aa
branches:  netbsd-3
changeset: 576463:7911779554aa
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Jul 03 17:05:22 2005 +0000

description:
Pull up revision 1.7 (requested by tron in ticket #544):
Install "afb" module again on systems which use an X11 server with
loadable modules and don't install the static "afb" library on systems
which use a static server. This fixes build problems introduced by
recent changes.

diffstat:

 x11/Xserver/afb/Makefile |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (24 lines):

diff -r 0e663d59a7b7 -r 7911779554aa x11/Xserver/afb/Makefile
--- a/x11/Xserver/afb/Makefile  Sun Jul 03 17:05:20 2005 +0000
+++ b/x11/Xserver/afb/Makefile  Sun Jul 03 17:05:22 2005 +0000
@@ -1,12 +1,14 @@
-
+#      $NetBSD: Makefile,v 1.4.8.3 2005/07/03 17:05:22 snj Exp $
 
-.include "../Makefile.serverlib"
 .include <bsd.x11.mk>
 
 .if defined(X11FLAGS.LOADABLE)
-SRCS=          afbmodule.c
-CPPFLAGS+=     ${X11FLAGS.LOADABLE}
-XMODULEDIR=    ${X11USRLIBDIR}/modules
+SUBDIR+=       afbmod
+.else
+SUBDIR+=       afb
 .endif
 
-.include "Makefile.afb"
+.include <bsd.subdir.mk>
+
+gaga:
+       @echo ${SUBDIR}



Home | Main Index | Thread Index | Old Index