From: Joshua Wise <joshua@escape.wv.cc.cmu.edu>
Date: Sat, 10 Oct 2009 09:05:35 +0000 (-0400)
Subject: Move elfload into tools/
X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/b83b409494b6aedcbcb0548665b8edebba19b43e?hp=c7eda62d83dd463895a3b096f8c32502077e7bcd

Move elfload into tools/
---

diff --git a/elfload/.gitignore b/elfload/.gitignore
deleted file mode 100644
index 955951e..0000000
--- a/elfload/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-loader
diff --git a/elfload/Makefile b/elfload/Makefile
deleted file mode 100644
index be876f8..0000000
--- a/elfload/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-loader: loader.c
-	gcc loader.c -o loader
-
-clean:
-	rm -f loader
diff --git a/tools/Makefile b/tools/Makefile
index 4b0978b..dba267c 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,5 +1,7 @@
+-include ../config.mk
+
 CFLAGS=-I../include
-CC=gcc
+CC=$(CROSS)gcc
 SMRAM_ICH2_OBJS=smram-linux-tool.o ../pci/pci-linux.o ../ich2/smram-ich2.noraw.o
 PCI_OBJS=pci.o ../pci/pci-linux.o
 POKE_RLS_OBJS=poke-rls.o poke-rls-asm.o ../pci/pci-linux.o
@@ -8,19 +10,22 @@ FROB_RLS_OBJS=frob-rls.o poke-rls-asm.o ../pci/pci-linux.o
 all: smram-ich2 port pci poke-rls
 
 %.noraw.o: %.c
-	gcc $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 smram-ich2: $(SMRAM_ICH2_OBJS)
-	gcc $(CFLAGS) -o smram-ich2 $(SMRAM_ICH2_OBJS)
+	$(CC) $(CFLAGS) -o smram-ich2 $(SMRAM_ICH2_OBJS)
 
 port: port.o
-	gcc -o port port.o
+	$(CC) -o port port.o
+
+elfload: elfload.o
+	$(CC) -o elfload elfload.o
 
 pci: $(PCI_OBJS)
-	gcc $(CFLAGS) -o pci $(PCI_OBJS)
+	$(CC) $(CFLAGS) -o pci $(PCI_OBJS)
 
 frob-rls: $(FROB_RLS_OBJS)
-	gcc $(CFLAGS) -o frob-rls $(FROB_RLS_OBJS)
+	$(CC) $(CFLAGS) -o frob-rls $(FROB_RLS_OBJS)
 
 clean:
 	rm -f $(SMRAM_ICH2_OBJS) smram-ich2
diff --git a/elfload/loader.c b/tools/elfload.c
similarity index 100%
rename from elfload/loader.c
rename to tools/elfload.c