From c0b832ceed2ea665118dcd4cc319bf719b9a5edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Hord=C3=A9?= Date: Wed, 12 Dec 2018 12:37:19 +0100 Subject: [PATCH] build: correction erreur makefile --- lib/makefile | 5 ++++- programs/lib/makefile | 4 +++- programs/makefile | 3 ++- system/makefile | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/makefile b/lib/makefile index 4856148..8f37f25 100755 --- a/lib/makefile +++ b/lib/makefile @@ -10,7 +10,7 @@ CHANGEPERM=chmod 644 all: libs.o sync -togit: clean indent clean +togit: clean indent libs.o:$(OBJS) $(LINK) libs.o $(OBJS) @@ -29,10 +29,13 @@ indent: $(CHANGEPERM) *.c $(CONVERT) *.c $(INDENT) *.c + $(REMOVE) *.c~ $(CHANGEPERM) ./*/*.c $(CONVERT) ./*/*.c $(INDENT) ./*/*.c + $(REMOVE) */*.c~ $(CHANGEPERM) ../include/*.h $(CONVERT) ../include/*.h $(INDENT) ../include/*.h + $(REMOVE) ../include/*.h~ sync diff --git a/programs/lib/makefile b/programs/lib/makefile index 64c2a95..f0b2a16 100644 --- a/programs/lib/makefile +++ b/programs/lib/makefile @@ -11,7 +11,7 @@ CHANGEPERM=chmod 644 all: libs.a sync -togit: clean indent clean +togit: clean indent libs.a:libs.o $(ARCH) $@ $^ @@ -32,7 +32,9 @@ indent: $(CHANGEPERM) *.c $(CONVERT) *.c $(INDENT) *.c + $(REMOVE) *.c~ $(CHANGEPERM) ../include/*.h $(CONVERT) ../include/*.h $(INDENT) ../include/*.h + $(REMOVE) ../include/*.h~ sync diff --git a/programs/makefile b/programs/makefile index 5fbbb1e..a17bb24 100755 --- a/programs/makefile +++ b/programs/makefile @@ -11,7 +11,7 @@ CHANGEPERM=chmod 644 all: lib/libs.a $(EXECS) sync -togit: clean indent clean +togit: clean indent lib/libs.a: make -C lib @@ -34,4 +34,5 @@ indent: $(CHANGEPERM) *.c $(CONVERT) *.c $(INDENT) *.c + $(REMOVE) *.c~ sync diff --git a/system/makefile b/system/makefile index 90dfa82..471387a 100755 --- a/system/makefile +++ b/system/makefile @@ -9,7 +9,7 @@ CHANGEPERM=chmod 644 all: system.sys sync -togit: clean indent clean +togit: clean indent system.sys: multiboot.o system.o ../lib/libs.o $(LINK) system.sys multiboot.o system.o ../lib/libs.o @@ -33,4 +33,5 @@ indent: $(CHANGEPERM) *.c $(CONVERT) *.c $(INDENT) *.c + $(REMOVE) *.c~ sync