Updated Makefile for more consistency
This commit is contained in:
parent
1fc49a33df
commit
0e2a460700
4
Makefile
4
Makefile
|
@ -67,6 +67,8 @@ CRTENDOBJ := $(shell $(C) $(CFLAGS) -print-file-name=crtend.o)
|
||||||
CRTBEGIN := $(GLOBALARCHDIR)/crti.o $(CRTBEGINOBJ)
|
CRTBEGIN := $(GLOBALARCHDIR)/crti.o $(CRTBEGINOBJ)
|
||||||
CRTEND := $(CRTENDOBJ) $(GLOBALARCHDIR)/crtn.o
|
CRTEND := $(CRTENDOBJ) $(GLOBALARCHDIR)/crtn.o
|
||||||
|
|
||||||
|
LINKERFILE := $(SRCDIR)/linker.lds
|
||||||
|
|
||||||
MAKEOBJS := $(GLOBALARCHDIR)/crti.o $(GLOBALARCHDIR)/crtn.o $(BUILDDIR)/linker.lds $(OBJECTS) $(ASOBJECTS)
|
MAKEOBJS := $(GLOBALARCHDIR)/crti.o $(GLOBALARCHDIR)/crtn.o $(BUILDDIR)/linker.lds $(OBJECTS) $(ASOBJECTS)
|
||||||
|
|
||||||
#Order the objects to prevent weird gcc bugs with global constructors
|
#Order the objects to prevent weird gcc bugs with global constructors
|
||||||
|
@ -87,7 +89,7 @@ bin/ZoarialBareOS.bin: $(MAKEOBJS)
|
||||||
bin/grub.cfg: $(SRCDIR)/grub.cfg
|
bin/grub.cfg: $(SRCDIR)/grub.cfg
|
||||||
cp $(SRCDIR)/grub.cfg bin/grub.cfg
|
cp $(SRCDIR)/grub.cfg bin/grub.cfg
|
||||||
|
|
||||||
$(BUILDDIR)/linker.lds: $(SRCDIR)/linker.lds.S
|
$(BUILDDIR)/linker.lds: $(LINKERFILE)
|
||||||
$(C) $(CFLAGS) $(INC) -E -P -o $@ -x c-header $^
|
$(C) $(CFLAGS) $(INC) -E -P -o $@ -x c-header $^
|
||||||
|
|
||||||
#Include dependencies which are created
|
#Include dependencies which are created
|
||||||
|
|
Loading…
Reference in New Issue