# HG changeset patch
# User Taiki TAIRA <e095767@ie.u-ryukyu.ac.jp>
# Date 1336719315 -32400
# Node ID d89b6aa4f3594bebe0fdcd223351675ed89001da
# Parent  fd70ec978d9f87ad5d632143fe3cb92f0004a2aa
add Makefile.def ,and start to writte cbc_os appversion

diff -r fd70ec978d9f -r d89b6aa4f359 Makefile
--- a/Makefile	Sat May 05 20:36:39 2012 +0900
+++ b/Makefile	Fri May 11 15:55:15 2012 +0900
@@ -1,25 +1,16 @@
-TARGET = kernel.efi
-HOME = /Users/TaikiTAIRA
+include ./Makefile.def
 
-prefix_gcc = $(HOME)/thesis/os/build-tools/gcc/bin
-prefix_cbc = $(HOME)/hg/CbC/build-CbC/INSTALL_DIR/bin
-prefix_ld = $(HOME)/thesis/os/build-tools/binutils/bin
-
-CC = $(prefix_gcc)/gcc
-CBC = $(prefix_cbc)/cbc-gcc-4.6.0
-LD = $(prefix_ld)/x86_64-os-elf-ld
+#$(TARGET): kernel.o bootstrap.o
+#	$(LD) $(LDFLAGS) bootstrap.o kernel.o  
 
-LDFLAGS = -nostdlib -Ttext=0x100000 --oformat efi-x86-64
-CFLAGS = -pipe -ffreestanding -fno-common -fno-builtin -fomit-frame-pointer -g -Wall -O2
-
-$(TARGET): kernel.o head.o
-	$(LD) $(LDFLAGS) kernel.o head.o 
+#bootstrap.o: bootstrap.S 
+#	$(CBC) -o bootstrap.o bootstrap.S 
 
-kernel.o: kernel.cbc
-	$(CBC) $(CFLAGS) kernel.cbc
+#kernel.o: kernel.cbc
+#	$(CBC) $(CFLAGS) kernel.o kernel.cbc
 
-head.o: head.S multiboot.h
-	$(CBC) $(CFLAGS) head.S
+$(TARGET): kernel.cbc
+	$(CBC) $(CFLAGS) $(TARGET) kernel.cbc
 
 clean:
-	rm -rf *.o kernel.efi
+	rm -rf *.o kernel
diff -r fd70ec978d9f -r d89b6aa4f359 Makefile.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.def	Fri May 11 15:55:15 2012 +0900
@@ -0,0 +1,27 @@
+TARGET	 = kernel
+HOME 	= /Users/TaikiTAIRA
+
+prefix_cbc	= $(HOME)/hg/CbC/build-CbC/INSTALL_DIR/bin
+prefix_gcc	= $(HOME)/thesis/os/build-tools/gcc/bin
+prefix_binutils	= $(HOME)/thesis/os/build-tools/binutils/bin
+
+CC	= $(prefix_gcc)/gcc
+CBC = $(prefix_cbc)/cbc-gcc-4.6.0
+LD	= $(prefix_binutils)/x86_64-os-elf-ld
+AS	= $(prefix_binutils)/x86_64-os-elf-as
+
+CFLAGS	= -m64 \
+		  -ffreestanding \
+		  -nostdlib \
+		  -mcmodel=large \
+		  -pipe \
+		  -fno-common \
+		  -fomit-frame-pointer \
+		  -g -Wall -O2 -c -o
+#ASFLAGS	=  -pipe -ffreestanding -fno-common \
+		  -fno-builtin -fomit-frame-pointer -g -Wall -O2 -o
+LDFLAGS	= -nostdlib \
+		  -nodefaultlibs \
+		  -Ttext=0x100000 \
+		  --oformat elf64-x86-64 
+