Cleaned up the Sortix makefile.
This commit is contained in:
parent
2a4a51fafc
commit
74dab2cbca
|
@ -57,9 +57,21 @@ ifeq ($(DISKWRITE),1)
|
||||||
else
|
else
|
||||||
DEFINES:=$(DEFINES) -DENABLE_DISKWRITE=0
|
DEFINES:=$(DEFINES) -DENABLE_DISKWRITE=0
|
||||||
endif
|
endif
|
||||||
CPPFLAGSRELEASE=-s $(O)
|
|
||||||
CPPFLAGSDEBUG=
|
INCLUDES=-I../libmaxsi/preproc -I.. -I.
|
||||||
CPPFLAGS=-I ../libmaxsi/preproc -I.. -I. $(CPUDEFINES) $(CPUFLAGS) -std=gnu++0x -Wall -Wextra -nostdlib -fno-builtin -nostartfiles -nodefaultlibs -fno-exceptions -fno-rtti -fno-stack-protector $(DEFINES) $(CPPFLAGSRELEASE)
|
CPPFLAGS=$(INCLUDES) $(DEFINES)
|
||||||
|
FLAGSRELEASE=-s $(O)
|
||||||
|
FLAGSDEBUG=
|
||||||
|
FLAGS=$(CPUFLAGS) -Wall -Wall -Wextra -nostdlib -fno-builtin -nostartfiles \
|
||||||
|
-nodefaultlibs -fno-stack-protector $(FLAGSRELEASE)
|
||||||
|
CFLAGS=$(FLAGS)
|
||||||
|
CXXFLAGS=$(FLAGS) -std=gnu++0x -fno-exceptions -fno-rtti
|
||||||
|
ASFLAGS=$(CPUASFLAGS)
|
||||||
|
NASMFLAGS=$(CPUNASMFLAGS)
|
||||||
|
|
||||||
|
STATICLIBS=\
|
||||||
|
../libmaxsi/libmaxsi-sortix.a \
|
||||||
|
|
||||||
OBJS=$(CPUOBJS) \
|
OBJS=$(CPUOBJS) \
|
||||||
kernel.o \
|
kernel.o \
|
||||||
descriptor_tables.o \
|
descriptor_tables.o \
|
||||||
|
@ -99,8 +111,8 @@ fs/devfs.o \
|
||||||
fs/initfs.o \
|
fs/initfs.o \
|
||||||
fs/ramfs.o \
|
fs/ramfs.o \
|
||||||
ata.o \
|
ata.o \
|
||||||
../libmaxsi/libmaxsi-sortix.a \
|
$(STATICLIBS) \
|
||||||
end.o # Must be last
|
end.o # Must be last, determines kernel size.
|
||||||
|
|
||||||
JSOBJS:=$(subst .o,-js.o,$(OBJS))
|
JSOBJS:=$(subst .o,-js.o,$(OBJS))
|
||||||
|
|
||||||
|
@ -133,13 +145,13 @@ sortix.bin: sortix-$(BUILDID).tmp
|
||||||
cp -vu $< $@
|
cp -vu $< $@
|
||||||
|
|
||||||
%.o: %.cpp
|
%.o: %.cpp
|
||||||
g++ -c $< -o $@ $(CPPFLAGS)
|
g++ -c $< -o $@ $(CPPFLAGS) $(CXXFLAGS)
|
||||||
|
|
||||||
%.o: %.s
|
%.o: %.s
|
||||||
as $(CPUASFLAGS) $< -o $@
|
as $(ASFLAGS) $< -o $@
|
||||||
|
|
||||||
%.o: %.asm
|
%.o: %.asm
|
||||||
nasm $(CPUNASMFLAGS) $< -o $@
|
nasm $(NASMFLAGS) $< -o $@
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
for D in $(DIRS); do rm -f $$D/*.o $$D/*.bin $$D/*.out $$D/*.tmp; done
|
for D in $(DIRS); do rm -f $$D/*.o $$D/*.bin $$D/*.out $$D/*.tmp; done
|
||||||
|
|
Loading…
Reference in New Issue