From owner-p4-projects@FreeBSD.ORG  Mon Jun 19 18:45:29 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6B0E516A47E; Mon, 19 Jun 2006 18:45:29 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 42C2316A479
	for <perforce@FreeBSD.org>; Mon, 19 Jun 2006 18:45:29 +0000 (UTC)
	(envelope-from swhitman@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0F63F43D46
	for <perforce@FreeBSD.org>; Mon, 19 Jun 2006 18:45:29 +0000 (GMT)
	(envelope-from swhitman@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5JIjSYt097115
	for <perforce@FreeBSD.org>; Mon, 19 Jun 2006 18:45:28 GMT
	(envelope-from swhitman@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5JIjSwd097112
	for perforce@freebsd.org; Mon, 19 Jun 2006 18:45:28 GMT
	(envelope-from swhitman@FreeBSD.org)
Date: Mon, 19 Jun 2006 18:45:28 GMT
Message-Id: <200606191845.k5JIjSwd097112@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	swhitman@FreeBSD.org using -f
From: Spencer Whitman <swhitman@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 99631 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jun 2006 18:45:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=99631

Change 99631 by swhitman@swhitman_joecatmini on 2006/06/19 18:45:23

	Got Makefile to compile code, but does not link properly.  Added 
	the original Makefile (Makefile2).

Affected files ...

.. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/Makefile#2 edit
.. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/Makefile2#1 add
.. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/k.c#2 edit
.. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/parser.c#2 edit

Differences ...

==== //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/Makefile#2 (text+ko) ====

@@ -16,9 +16,11 @@
 
 NO_MAN	=	ha
 
-CIFLAGS	+=	-I. -I${.CURDIR}
+CIFLAGS	+=	-I. -I${.CURDIR} -I${.CURDIR}/../src/include -I${.CURDIR}/../src/sys/ -I${.CURDIR}/../src/sys/sys/ -I${.CURDIR}/../src/sys/machine/
+#CLIBS 	+=	-L../src/lib/
 CFLAGS	+=	${CIFLAGS}
-
+CFLAGS 	+=	${CLIBS}
+CFLAGS 	+= 	-nostdinc
 CFLAGS	+=	-g
 
 .include <bsd.prog.mk>

==== //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/k.c#2 (text+ko) ====

@@ -11,12 +11,12 @@
 #include <printf.h>
 #include <sys/queue.h>
 
-#include "k.h"
+#include <k.h>
 
 /* Printf Render for Token -------------------------------------------*/
 
 static int
-printf_arginfo_token(const struct printf_info /* *pi */ __unused, size_t n, int *argt)
+printf_arginfo_token(const struct printf_info  *pi  __unused, size_t n, int *argt)
 {
 
 	assert(n >= 1);

==== //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/parser.c#2 (text+ko) ====