Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2024-12-23 01:29:34 +00:00
Code Issues Projects Releases Wiki Activity

Add config.c, remove ata, add LIBS_MEDIA

Browse Source
This commit is contained in:
Laurent Vivier 2005-11-26 09:01:36 +00:00
parent b7204c461d
commit 10099df5fe
1 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
second/Makefile
View File

@ -17,8 +17,7 @@ CPPFLAGS = -DVERSION="\"$(VERSION)\"" -I$(TOP) -Wa,-I$(TOP) \
# -O2 is needed to be able to inline functions from libmacos # -O2 is needed to be able to inline functions from libmacos
CFLAGS = $(OPT_CFLAGS) -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar -fpic -O2 CFLAGS = $(OPT_CFLAGS) -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar -fpic -O2
ASFLAGS = ASFLAGS =
LIBS = -L$(TOP)/../libstream -lstream \ LIBS = $(OPT_LIBS) -L$(TOP)/../libiso9660/m68k-linux \
-L$(TOP)/../libiso9660/m68k-linux \
-liso9660 -L$(TOP)/../libunix -lunix \ -liso9660 -L$(TOP)/../libunix -lunix \
-L$(TOP)/../libmacos -lmacos -lunix \ -L$(TOP)/../libmacos -lmacos -lunix \
-L$(TOP)/../libgzip/m68k-linux -lgzip \ -L$(TOP)/../libgzip/m68k-linux -lgzip \
@ -28,13 +27,13 @@ LIBS = -L$(TOP)/../libstream -lstream \
LS = ls LS = ls
AWK = awk AWK = awk
HEADERS = arch.h bank.h bootenv.h bootinfo.h bootx.h cli.h console.h driver.h enter_kernel030.h enter_kernel040.h enter_kernel.h enter_kernelnoMMU.h enter_kernelPPC.h head.h keyboard.h load.h lowmem.h memory.h misc.h MMU030.h MMU040.h serial.h vga.h HEADERS = arch.h bank.h bootenv.h bootinfo.h bootx.h cli.h console.h driver.h enter_kernel030.h enter_kernel040.h enter_kernel.h enter_kernelnoMMU.h enter_kernelPPC.h head.h keyboard.h load.h lowmem.h memory.h misc.h MMU030.h MMU040.h serial.h vga.h config.h
SOURCES = head.S main.c console.c \ SOURCES = head.S main.c console.c \
font_8x16.c \ font_8x16.c \
misc.c bank.c arch.c \ misc.c bank.c arch.c \
load.c serial.c vga.c driver.c \ load.c serial.c vga.c driver.c \
enter_kernel.c enter_kernel.c config.c
SOURCES_CLI = keyboard.c cli.c SOURCES_CLI = keyboard.c cli.c
@ -59,14 +58,6 @@ OBJS_NETBSD_M68K = bootenv.o
OBJS_LINUX_PPC = bootx.o OBJS_LINUX_PPC = bootx.o
# MEDIA
OBJS_SCSI = container.o
OBJS_FLOPPY =
OBJS_ATA =
DISTFILES = $(SOURCES_ASM) $(SOURCES_C) $(HEADERS) DISTFILES = $(SOURCES_ASM) $(SOURCES_C) $(HEADERS)
ifeq ("$(TARGET)", "m68k-linux") ifeq ("$(TARGET)", "m68k-linux")
@ -111,22 +102,14 @@ endif
ifeq ("$(MEDIA)", "scsi") ifeq ("$(MEDIA)", "scsi")
OBJS_MEDIA = $(OBJS_SCSI) LIBS_MEDIA=-L$(TOP)/../libstream/hard -lstream
CPPFLAGS_MEDIA = -DSCSI_SUPPORT
else else
ifeq ("$(MEDIA)", "floppy") ifeq ("$(MEDIA)", "floppy")
OBJS_MEDIA = $(OBJS_FLOPPY) LIBS_MEDIA=-L$(TOP)/../libstream/floppy -lstream
CPPFLAGS_MEDIA = -DFLOPPY_SUPPORT
else else
ifeq ("$(MEDIA)", "ata")
OBJS_MEDIA = $(OBJS_ATA)
CPPFLAGS_MEDIA = -DATA_SUPPORT
endif
endif endif
endif endif
@ -139,7 +122,8 @@ $(TARGET)-$(MEDIA)/second::
AS=$(AS) SIGNATURE="$(SIGNATURE)" \ AS=$(AS) SIGNATURE="$(SIGNATURE)" \
OPT_CPPFLAGS="$(CPPFLAGS_TARGET) $(CPPFLAGS_MEDIA)" \ OPT_CPPFLAGS="$(CPPFLAGS_TARGET) $(CPPFLAGS_MEDIA)" \
OPT_CFLAGS="$(CFLAGS_TARGET)" \ OPT_CFLAGS="$(CFLAGS_TARGET)" \
OPTOBJS="$(OBJS_TARGET) $(OBJS_MEDIA)" OPTOBJS="$(OBJS_TARGET) $(OBJS_MEDIA)" \
OPT_LIBS="$(LIBS_MEDIA)"
second: second.o second: second.o
$(OBJCOPY) -j .text -j .data -j .rodata -j .got \ $(OBJCOPY) -j .text -j .data -j .rodata -j .got \