From 0009c2c1448897605fc66f6bc9f9083842b061d6 Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Fri, 18 Sep 2009 10:25:32 -0300 Subject: [PATCH 1/1] Rename test project to makeit There is a already GNU Make fork called remake. --- Build.mak | 4 ++-- lib1/Build.mak | 2 +- lib2/Build.mak | 2 +- lib2/lib2.cpp | 2 +- prog/main.cpp | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Build.mak b/Build.mak index 6c44697..72af2a0 100644 --- a/Build.mak +++ b/Build.mak @@ -1,9 +1,9 @@ # Create the include directory symlink -setup_include_dir__ := $(call symlink_include_dir,remake) +setup_include_dir__ := $(call symlink_include_dir,makeit) # General rule to install headers of this project -$I/include/remake/%.h: $T/%.h +$I/include/makeit/%.h: $T/%.h $(call install_file) # Include sub-directories makefiles diff --git a/lib1/Build.mak b/lib1/Build.mak index bf29c8f..298a88e 100644 --- a/lib1/Build.mak +++ b/lib1/Build.mak @@ -13,5 +13,5 @@ install += $I/lib/liblib1.so # Install the library's headers # XXX: we can't use += here, call will be resolved lazily if we do -install := $(install) $(call find_headers,h,$I/include/remake/lib1) +install := $(install) $(call find_headers,h,$I/include/makeit/lib1) diff --git a/lib2/Build.mak b/lib2/Build.mak index 3ef80b9..ba7d510 100644 --- a/lib2/Build.mak +++ b/lib2/Build.mak @@ -12,5 +12,5 @@ install += $I/lib/liblib2.so # Install the library's headers # XXX: we can't use += here, call will be resolved lazily if we do -install := $(install) $(call find_headers,h,$I/include/remake/lib2) +install := $(install) $(call find_headers,h,$I/include/makeit/lib2) diff --git a/lib2/lib2.cpp b/lib2/lib2.cpp index 7555392..490f312 100644 --- a/lib2/lib2.cpp +++ b/lib2/lib2.cpp @@ -2,7 +2,7 @@ #include "lib2.h" #include -#include +#include #include diff --git a/prog/main.cpp b/prog/main.cpp index 19ec21f..c6128f8 100644 --- a/prog/main.cpp +++ b/prog/main.cpp @@ -1,6 +1,6 @@ -#include -#include +#include +#include #include -- 2.43.0