Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2025-03-06 06:30:21 +00:00
Code Issues Projects Releases Wiki Activity

remove trailing spaces from multiple Makefiles

Browse Source
This commit is contained in:
John Paul Adrian Glaubitz 2017-03-15 22:56:49 +01:00
parent 4722d3550b
commit 710d7ed2f6
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -131,7 +131,7 @@ multiboot.bin: tools first vmlinuz second/$(KARCH)-linux-all/second
tools/emile-install -c $(FLOPPY_CONF) multiboot.bin.X tools/emile-install -c $(FLOPPY_CONF) multiboot.bin.X
mv multiboot.bin.X multiboot.bin mv multiboot.bin.X multiboot.bin
ln -s multiboot.bin last.bin ln -s multiboot.bin last.bin
boot.bin: floppy.bin boot.bin: floppy.bin
rm -f last.bin rm -f last.bin
cp floppy.bin boot.bin.X cp floppy.bin boot.bin.X
@ -204,7 +204,7 @@ first-uninstall::
$(MAKE) -C first uninstall $(MAKE) -C first uninstall
second-install:: second-install::
$(MAKE) -C second install $(MAKE) -C second install
second-uninstall:: second-uninstall::
$(MAKE) -C second uninstall $(MAKE) -C second uninstall

2
libunix/Makefile
View File

@ -14,7 +14,7 @@ SOURCES = divsi3.S modsi3.S mulsi3.S udivsi3.S umodsi3.S free.c malloc.c \
strcpy.c strlen.c strncpy.c vsprintf.c write.c strcmp.c \ strcpy.c strlen.c strncpy.c vsprintf.c write.c strcmp.c \
strncmp.c strtol.c strdup.c strncmp.c strtol.c strdup.c
HEADERS = HEADERS =
all: $(LIBRARY) all: $(LIBRARY)

20
second/Makefile
View File

@ -1,7 +1,7 @@
# #
# #
# (c) 2004-2007 Laurent Vivier <Laurent@Vivier.EU> # (c) 2004-2007 Laurent Vivier <Laurent@Vivier.EU>
# #
# #
TARGET = m68k-linux TARGET = m68k-linux
@ -16,7 +16,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 = $(OPT_LIBS) \ LIBS = $(OPT_LIBS) \
-L$(TOP)/../libiso9660/m68k-linux -liso9660 \ -L$(TOP)/../libiso9660/m68k-linux -liso9660 \
-L$(TOP)/../libext2/m68k-linux -lext2 \ -L$(TOP)/../libext2/m68k-linux -lext2 \
@ -128,7 +128,7 @@ $(TARGET)-$(MEDIA)/second::
OPT_CFLAGS="$(CFLAGS_TARGET)" \ OPT_CFLAGS="$(CFLAGS_TARGET)" \
OPTOBJS="$(OBJS_TARGET) $(OBJS_MEDIA)" \ OPTOBJS="$(OBJS_TARGET) $(OBJS_MEDIA)" \
OPT_LIBS="$(LIBS_MEDIA)" OPT_LIBS="$(LIBS_MEDIA)"
$(TARGET)-$(MEDIA)-driver/apple_driver:: $(TARGET)-$(MEDIA)-driver/apple_driver::
test -d $(TARGET)-$(MEDIA)-driver || mkdir $(TARGET)-$(MEDIA)-driver test -d $(TARGET)-$(MEDIA)-driver || mkdir $(TARGET)-$(MEDIA)-driver
cd $(TARGET)-$(MEDIA)-driver && make -f $(TOP)/Makefile apple_driver \ cd $(TARGET)-$(MEDIA)-driver && make -f $(TOP)/Makefile apple_driver \
@ -143,7 +143,7 @@ $(TARGET)-$(MEDIA)-driver/apple_driver::
OPTOBJS="$(OBJS_TARGET) $(OBJS_MEDIA)" \ OPTOBJS="$(OBJS_TARGET) $(OBJS_MEDIA)" \
OPT_LIBS="$(LIBS_MEDIA)" OPT_LIBS="$(LIBS_MEDIA)"
ifeq ("$(TARGET)", "ppc-linux") ifeq ("$(TARGET)", "ppc-linux")
bootstrapPPC.o: bootstrapPPC.S bootstrapPPC.o: bootstrapPPC.S
$(PPC_CC) $(CPPFLAGS) -c $(TOP)/bootstrapPPC.S -o bootstrapPPC.o $(PPC_CC) $(CPPFLAGS) -c $(TOP)/bootstrapPPC.S -o bootstrapPPC.o
@ -152,7 +152,7 @@ bootstrap: bootstrapPPC.o
-O binary bootstrapPPC.o bootstrap -O binary bootstrapPPC.o bootstrap
switch_to_PPC.o: switch_to_PPC.S bootstrap switch_to_PPC.o: switch_to_PPC.S bootstrap
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^
$(OBJCOPY) --add-section .bootstrap=bootstrap \ $(OBJCOPY) --add-section .bootstrap=bootstrap \
--set-section-flags .bootstrap=contents,alloc,load,data \ --set-section-flags .bootstrap=contents,alloc,load,data \
switch_to_PPC.o switch_to_PPC.o
@ -179,10 +179,10 @@ apple_driver.o: $(OBJS) $(TOP)/ld.script
$(LD) -T $(TOP)/ld.script -o apple_driver.o $(OBJS) $(LIBS) $(LD) -T $(TOP)/ld.script -o apple_driver.o $(OBJS) $(LIBS)
.c.o: .c.o:
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^ $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^
%030.o: %030.S; $(CC) $(CPPFLAGS) $(CFLAGS) -m68030 -Wa,-mcpu=68030 -c -o $@ $^ %030.o: %030.S; $(CC) $(CPPFLAGS) $(CFLAGS) -m68030 -Wa,-mcpu=68030 -c -o $@ $^
%040.o: %040.S; $(CC) $(CPPFLAGS) $(CFLAGS) -m68040 -Wa,-mcpu=68040 -c -o $@ $^ %040.o: %040.S; $(CC) $(CPPFLAGS) $(CFLAGS) -m68040 -Wa,-mcpu=68040 -c -o $@ $^
install:: install::
install -d $(DESTDIR)/$(PREFIX)/boot/emile/ install -d $(DESTDIR)/$(PREFIX)/boot/emile/