summaryrefslogtreecommitdiff
path: root/Makefile.common
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2015-05-12 22:22:06 +0200
committerMichal Idziorek <m.i@gmx.at>2015-05-12 22:22:06 +0200
commit2c1148e7920cf1d4c772d0d81757a7f8d736648e (patch)
treeeed84fead5fae2efb3526094eed05eeae127f915 /Makefile.common
parent0a9f1b1fb19ea7e0c54c884b7ae8c709ea738d1f (diff)
migrating to grub and elf kernel format
Diffstat (limited to 'Makefile.common')
-rw-r--r--Makefile.common3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.common b/Makefile.common
index 4cd411d..5436c87 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -4,6 +4,9 @@
%.bin: %.asm
nasm -f bin $*.asm -o $@
+
+%.o: %.s
+ i686-elf-as $*.s -o $@
%.o: %.c
$(CC) -c $(CFLAGS) $*.c -o $*.o