From 710d7ed2f65b0fd52fac1f68960c0b22f9d2b09f Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Wed, 15 Mar 2017 22:56:49 +0100 Subject: [PATCH] remove trailing spaces from multiple Makefiles --- Makefile | 4 ++-- libunix/Makefile | 2 +- second/Makefile | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index f2117b1..4e7a830 100644 --- a/Makefile +++ b/Makefile @@ -131,7 +131,7 @@ multiboot.bin: tools first vmlinuz second/$(KARCH)-linux-all/second tools/emile-install -c $(FLOPPY_CONF) multiboot.bin.X mv multiboot.bin.X multiboot.bin ln -s multiboot.bin last.bin - + boot.bin: floppy.bin rm -f last.bin cp floppy.bin boot.bin.X @@ -204,7 +204,7 @@ first-uninstall:: $(MAKE) -C first uninstall second-install:: - $(MAKE) -C second install + $(MAKE) -C second install second-uninstall:: $(MAKE) -C second uninstall diff --git a/libunix/Makefile b/libunix/Makefile index f3704e4..f51f5da 100644 --- a/libunix/Makefile +++ b/libunix/Makefile @@ -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 \ strncmp.c strtol.c strdup.c -HEADERS = +HEADERS = all: $(LIBRARY) diff --git a/second/Makefile b/second/Makefile index 643f36c..1f6d393 100644 --- a/second/Makefile +++ b/second/Makefile @@ -1,7 +1,7 @@ -# -# +# +# # (c) 2004-2007 Laurent Vivier -# +# # 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 CFLAGS = $(OPT_CFLAGS) -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar -fpic -O2 -ASFLAGS = +ASFLAGS = LIBS = $(OPT_LIBS) \ -L$(TOP)/../libiso9660/m68k-linux -liso9660 \ -L$(TOP)/../libext2/m68k-linux -lext2 \ @@ -128,7 +128,7 @@ $(TARGET)-$(MEDIA)/second:: OPT_CFLAGS="$(CFLAGS_TARGET)" \ OPTOBJS="$(OBJS_TARGET) $(OBJS_MEDIA)" \ OPT_LIBS="$(LIBS_MEDIA)" - + $(TARGET)-$(MEDIA)-driver/apple_driver:: test -d $(TARGET)-$(MEDIA)-driver || mkdir $(TARGET)-$(MEDIA)-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)" \ OPT_LIBS="$(LIBS_MEDIA)" -ifeq ("$(TARGET)", "ppc-linux") +ifeq ("$(TARGET)", "ppc-linux") bootstrapPPC.o: bootstrapPPC.S $(PPC_CC) $(CPPFLAGS) -c $(TOP)/bootstrapPPC.S -o bootstrapPPC.o @@ -152,7 +152,7 @@ bootstrap: bootstrapPPC.o -O binary bootstrapPPC.o 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 \ --set-section-flags .bootstrap=contents,alloc,load,data \ 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) .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 $@ $^ -%040.o: %040.S; $(CC) $(CPPFLAGS) $(CFLAGS) -m68040 -Wa,-mcpu=68040 -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 $@ $^ install:: install -d $(DESTDIR)/$(PREFIX)/boot/emile/