ich9deblob: moved src to src/, .o files to obj/

12 files changed, 18 insertions, 17 deletions

diff --git a/.gitignore b/.gitignore
index f90772c..d020963 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,4 @@
 /resources/utilities/ich9deblob/libreboot.rom
 /resources/utilities/ich9deblob/ich9deblob
 /resources/utilities/coreboot-libre/tocheck
-/resources/utilities/ich9deblob/*.o
-/resources/utilities/ich9deblob/*/*.o
+/resources/utilities/ich9deblob/obj/
diff --git a/resources/utilities/ich9deblob/Makefile b/resources/utilities/ich9deblob/Makefile
index f9a6598..87e6da2 100644
--- a/resources/utilities/ich9deblob/Makefile
+++ b/resources/utilities/ich9deblob/Makefile
@@ -19,29 +19,31 @@
 
 CC=gcc
 CFLAGS=-I. -Wall -g
+NOLINKER=-c
 
 all: ich9deblob
 
-ich9deblob: ich9deblob.o common/descriptor_gbe.o descriptor/descriptor.o \
-		gbe/gbe.o common/x86compatibility.o
+ich9deblob: obj/ich9deblob.o obj/common/descriptor_gbe.o \
+		obj/descriptor/descriptor.o obj/gbe/gbe.o obj/common/x86compatibility.o
 		
-	$(CC) $(CFLAGS) ich9deblob.o common/descriptor_gbe.o common/x86compatibility.o \
-		descriptor/descriptor.o gbe/gbe.o -o ich9deblob
+	$(CC) $(CFLAGS) obj/ich9deblob.o obj/common/descriptor_gbe.o \
+		obj/common/x86compatibility.o obj/descriptor/descriptor.o obj/gbe/gbe.o \
+		 -o ich9deblob
 
-ich9deblob.o: ich9deblob.c
-	$(CC) $(CFLAGS) -c ich9deblob.c -o ich9deblob.o
+obj/ich9deblob.o:
+	$(CC) $(CFLAGS) $(NOLINKER) src/ich9deblob.c -o obj/ich9deblob.o
 	
-common/descriptor_gbe.o: common/descriptor_gbe.c
-	$(CC) $(CFLAGS) -c common/descriptor_gbe.c -o common/descriptor_gbe.o
+obj/common/descriptor_gbe.o:
+	$(CC) $(CFLAGS) $(NOLINKER) src/common/descriptor_gbe.c -o obj/common/descriptor_gbe.o
 	
-common/x86compatibility.o: common/x86compatibility.c
-	$(CC) $(CFLAGS) -c common/x86compatibility.c -o common/x86compatibility.o
+obj/common/x86compatibility.o:
+	$(CC) $(CFLAGS) $(NOLINKER) src/common/x86compatibility.c -o obj/common/x86compatibility.o
 
-descriptor/descriptor.o: descriptor/descriptor.c
-	$(CC) $(CFLAGS) -c descriptor/descriptor.c -o descriptor/descriptor.o
+obj/descriptor/descriptor.o:
+	$(CC) $(CFLAGS) $(NOLINKER) src/descriptor/descriptor.c -o obj/descriptor/descriptor.o
 
-gbe/gbe.o: gbe/gbe.c
-	$(CC) $(CFLAGS) -c gbe/gbe.c -o gbe/gbe.o
+obj/gbe/gbe.o:
+	$(CC) $(CFLAGS) $(NOLINKER) src/gbe/gbe.c -o obj/gbe/gbe.o
 	
 clean:
-	rm -f ich9deblob *.o */*.o
+	rm -rf ich9deblob obj/*.o obj/*/*.o
diff --git a/resources/utilities/ich9deblob/common/descriptor_gbe.c b/resources/utilities/ich9deblob/src/common/descriptor_gbe.c
index fcb80d0..fcb80d0 100644
--- a/resources/utilities/ich9deblob/common/descriptor_gbe.c
+++ b/resources/utilities/ich9deblob/src/common/descriptor_gbe.c
diff --git a/resources/utilities/ich9deblob/common/descriptor_gbe.h b/resources/utilities/ich9deblob/src/common/descriptor_gbe.h
index cc0cc42..cc0cc42 100644
--- a/resources/utilities/ich9deblob/common/descriptor_gbe.h
+++ b/resources/utilities/ich9deblob/src/common/descriptor_gbe.h
diff --git a/resources/utilities/ich9deblob/common/x86compatibility.c b/resources/utilities/ich9deblob/src/common/x86compatibility.c
index 505a37d..505a37d 100644
--- a/resources/utilities/ich9deblob/common/x86compatibility.c
+++ b/resources/utilities/ich9deblob/src/common/x86compatibility.c
diff --git a/resources/utilities/ich9deblob/common/x86compatibility.h b/resources/utilities/ich9deblob/src/common/x86compatibility.h
index d9d5bdb..d9d5bdb 100644
--- a/resources/utilities/ich9deblob/common/x86compatibility.h
+++ b/resources/utilities/ich9deblob/src/common/x86compatibility.h
diff --git a/resources/utilities/ich9deblob/descriptor/descriptor.c b/resources/utilities/ich9deblob/src/descriptor/descriptor.c
index aa3d84e..aa3d84e 100644
--- a/resources/utilities/ich9deblob/descriptor/descriptor.c
+++ b/resources/utilities/ich9deblob/src/descriptor/descriptor.c
diff --git a/resources/utilities/ich9deblob/descriptor/descriptor.h b/resources/utilities/ich9deblob/src/descriptor/descriptor.h
index 863b894..863b894 100644
--- a/resources/utilities/ich9deblob/descriptor/descriptor.h
+++ b/resources/utilities/ich9deblob/src/descriptor/descriptor.h
diff --git a/resources/utilities/ich9deblob/gbe/gbe.c b/resources/utilities/ich9deblob/src/gbe/gbe.c
index 9eee828..9eee828 100644
--- a/resources/utilities/ich9deblob/gbe/gbe.c
+++ b/resources/utilities/ich9deblob/src/gbe/gbe.c
diff --git a/resources/utilities/ich9deblob/gbe/gbe.h b/resources/utilities/ich9deblob/src/gbe/gbe.h
index bfcc002..bfcc002 100644
--- a/resources/utilities/ich9deblob/gbe/gbe.h
+++ b/resources/utilities/ich9deblob/src/gbe/gbe.h
diff --git a/resources/utilities/ich9deblob/ich9deblob.c b/resources/utilities/ich9deblob/src/ich9deblob.c
index ee549d2..ee549d2 100644
--- a/resources/utilities/ich9deblob/ich9deblob.c
+++ b/resources/utilities/ich9deblob/src/ich9deblob.c
diff --git a/resources/utilities/ich9deblob/ich9deblob.h b/resources/utilities/ich9deblob/src/ich9deblob.h
index a765bb5..a765bb5 100644
--- a/resources/utilities/ich9deblob/ich9deblob.h
+++ b/resources/utilities/ich9deblob/src/ich9deblob.h