summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-07-18 19:34:43 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-07-18 19:34:43 +0000
commiteb241c33781af958adbcdb2755c6d2d696740c77 (patch)
treebb03a038f6c6aa51918f3ca7911ae2c550393296
parent2007-07-18 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadnetwork-demos-eb241c33781af958adbcdb2755c6d2d696740c77.tar.bz2
2007-07-18 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile: Eliminate unneeded temp.o
-rw-r--r--http/ChangeLog4
-rw-r--r--http/Makefile3
2 files changed, 5 insertions, 2 deletions
diff --git a/http/ChangeLog b/http/ChangeLog
index 9bf62a5..c22162f 100644
--- a/http/ChangeLog
+++ b/http/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-18 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * Makefile: Eliminate unneeded temp.o
+
2007-07-12 Joel Sherrill <joel.sherrill@oarcorp.com>
* init.c: Account for adding port to shttpd initialization.
diff --git a/http/Makefile b/http/Makefile
index 3265b73..0692369 100644
--- a/http/Makefile
+++ b/http/Makefile
@@ -44,7 +44,7 @@ LD_PATHS +=
OBJDUMP=$(OBJCOPY:copy=dump)
USE_GOHEAD=no
-USE_SIMPLE=yes
+USE_SIMPLE=no
USE_FTPD=yes
ifeq ($(USE_GOHEAD),yes)
HTTPD = GoAhead Web Server
@@ -89,7 +89,6 @@ $(ARCH)/tarfile.o: $(ARCH) stamp-index-html obj_format
cd rootfs ; tar cf ../$(ARCH)/tarfile --exclude CVS .
cp $(ARCH)/tarfile .
$(OBJCOPY) -I binary -O `cat obj_format` tarfile $(ARCH)/tarfile.o
- $(LD) $(LD_CPU_CFLAGS) -r -o $(ARCH)/temp.o $(ARCH)/tarfile.o
stamp-index-html: index.html.in
ifneq ($(HTTPD),)