Merge pull request datto#20 from Conan-Kudo/fixMakefile

Rename img-merge to update-img, add install target for utils, and delete Makefile.in files
lkkey80 · Feb 26, 2016 · 86ffe46 · 86ffe46
2 parents fcc2552 + 66d0fc0
commit 86ffe46
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 77 deletions.
diff --git a/Makefile b/Makefile
@@ -36,6 +36,7 @@ clean:
 install:
 	$(MAKE) -C lib install
 	$(MAKE) -C app install
+	$(MAKE) -C utils install
 
 install-static:
 	$(MAKE) -C app install-static
diff --git a/app/Makefile.in b/app/Makefile.in
diff --git a/lib/Makefile.in b/lib/Makefile.in
diff --git a/src/Makefile.in b/src/Makefile.in
diff --git a/utils/Makefile b/utils/Makefile
@@ -1,7 +1,15 @@
-.PHONY: all clean
+BINARY_NAME = update-img
+INSTALLDIR = $(PREFIX)/bin
+SOURCES = update-img.c
+
+.PHONY: all clean install
 
 all:
-	gcc -Wall -o img-merge img-merge.c
-
+	$(CC) $(CCFLAGS) -o $(BINARY_NAME) -L $(BASE_DIR)/utils $(SOURCES)
+
+install: all
+	mkdir -p $(INSTALLDIR)
+	install $(BINARY_NAME) $(INSTALLDIR)
+
 clean:
-	rm -f img-merge
+	rm -f $(BINARY_NAME)
diff --git a/utils/Makefile.in b/utils/Makefile.in
diff --git a/utils/img-merge.c → utils/update-img.c b/utils/img-merge.c → utils/update-img.c
@@ -22,8 +22,8 @@
 
 typedef unsigned long long sector_t;
 
-static void print_help(int status){
-	printf("Usage: img-merge <snapshot device> <cow file> <image file>\n");
+static void print_help(char* progname, int status){
+	printf("Usage: %s <snapshot device> <cow file> <image file>\n", progname);
 	exit(status);
 }
 
@@ -64,7 +64,7 @@ int main(int argc,char *argv[]){
 	FILE *cow = NULL, *snap = NULL, *img = NULL;
 	uint64_t *mappings = NULL;
 
-	if(argc != 4) print_help(-1);
+	if(argc != 4) print_help(argv[0], -1);
 
 	//open snapshot
 	snap = fopen(argv[1], "r");