[Midnightbsd-cvs] src: Makefile: merge

[laffer1 at midnightbsd.org]

Log Message:
-----------
merge

Modified Files:
--------------
    src/sys/modules/dcons:
        Makefile (r1.1.1.2 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sys/modules/dcons/Makefile,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L sys/modules/dcons/Makefile -L sys/modules/dcons/Makefile -u -r1.1.1.2 -r1.2
--- sys/modules/dcons/Makefile
+++ sys/modules/dcons/Makefile
@@ -1,16 +1,19 @@
 # $Id: Makefile,v 1.6 2003/10/24 15:41:26 simokawa Exp $
-# $FreeBSD: src/sys/modules/dcons/Makefile,v 1.3.2.1 2006/02/10 00:38:00 yar Exp $
+# $FreeBSD: src/sys/modules/dcons/Makefile,v 1.5 2007/06/01 00:23:34 simokawa Exp $
 
 .PATH:	${.CURDIR}/../../dev/dcons
 
 KMOD	= dcons
 SRCS	= dcons.c dcons.h dcons_os.c dcons_os.h \
-		opt_dcons.h opt_ddb.h opt_comconsole.h
+		opt_dcons.h opt_kdb.h opt_ddb.h opt_gdb.h opt_comconsole.h
 
 .if !defined(KERNBUILDDIR)
-opt_ddb.h:
+opt_kdb.h:
 	echo "#define KDB 1" > $@
 
+opt_ddb.h:
+	echo "#define DDB 1" > $@
+
 opt_comconsole.h:
 	echo "#define ALT_BREAK_TO_DEBUGGER 1" > $@
 .endif