oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor makefile changes for GCC

Browse Source
This commit is contained in:
Arun Thomas 2010-06-01 09:41:31 +00:00
parent 40f440b8cd
commit 8579c59b3f
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -29,7 +29,11 @@ usage:
# 'make install' target. # 'make install' target.
# #
# etcfiles has to be done first. # etcfiles has to be done first.
world: mkfiles includes depend libraries install postinstall .if ${COMPILER_TYPE} == "ack"
world: mkfiles includes depend libraries install
.elif ${COMPILER_TYPE} == "gnu"
world: mkfiles includes depend gnu-libraries install
.endif
mkfiles: mkfiles:
cp etc/mk/*.mk /etc/mk/ cp etc/mk/*.mk /etc/mk/
@ -87,6 +91,3 @@ clean::
cd lib && sh gnu_build.sh clean cd lib && sh gnu_build.sh clean
cd commands && $(MAKE) clean cd commands && $(MAKE) clean
cd test && $(MAKE) clean cd test && $(MAKE) clean
postinstall:
cd etc && $(MAKE) $@

5
etc/Makefile
View File

@ -1,4 +1,3 @@
ETC=/etc/ ETC=/etc/
USRETC=/usr/etc/ USRETC=/usr/etc/
FILES1=fstab group hostname.file inet.conf motd.install mtab passwd profile \ FILES1=fstab group hostname.file inet.conf motd.install mtab passwd profile \
@ -34,7 +33,3 @@ install::
for u in /usr/ast ~root; do cp ast/.[aepv]* $$u ; done for u in /usr/ast ~root; do cp ast/.[aepv]* $$u ; done
@echo "Installing fonts.." @echo "Installing fonts.."
install -m 644 -o root -g operator fonts/*.fnt /usr/lib/fonts/ install -m 644 -o root -g operator fonts/*.fnt /usr/lib/fonts/
postinstall:
binsizes normal

2
kernel/Makefile
View File

@ -19,7 +19,7 @@ CPPFLAGS+= -fno-builtin -ffreestanding -fno-stack-protector
LDFLAGS+= -T arch/${ARCH}/kernel.lds LDFLAGS+= -T arch/${ARCH}/kernel.lds
LDFLAGS+= -nostdlib LDFLAGS+= -nostdlib
DPADD+= ${LIBC} DPADD+= ${LIBC}
LDADD+= -lgcc -lc -lgcc LDADD+= -lc
.endif .endif
CPPFLAGS+= -I${.CURDIR}/arch/${ARCH}/include -I${MINIXSRCDIR} CPPFLAGS+= -I${.CURDIR}/arch/${ARCH}/include -I${MINIXSRCDIR}

2
test/Makefile
View File

@ -1,6 +1,5 @@
# Makefile for the tests. # Makefile for the tests.
CC = exec cc
GCC= /usr/gnu/bin/gcc GCC= /usr/gnu/bin/gcc
CFLAGS= -O -D_MINIX -D_POSIX_SOURCE CFLAGS= -O -D_MINIX -D_POSIX_SOURCE
CFLAGS-GCC= $(CFLAGS) -Wall CFLAGS-GCC= $(CFLAGS) -Wall
@ -109,4 +108,3 @@ test51: test51.c
test51-gcc: test51.c test51-gcc: test51.c
test52: test52.c test52: test52.c
test52-gcc: test52.c test52-gcc: test52.c