diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-11-06 19:54:04 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-11-06 19:54:04 +0000 |
| commit | 4602bc4dec6b02563041182f77ed2210f6374a32 (patch) | |
| tree | 0dc7994fa6b3fd1def60711570554feba7a65d75 | |
| parent | This commit was manufactured by cvs2svn to create branch 'network- (diff) | |
| download | network-demos-4602bc4dec6b02563041182f77ed2210f6374a32.tar.bz2 | |
2007-11-06 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile: Switch to using rtems-bin2c for initial filesystem image.
| -rw-r--r-- | http/ChangeLog | 4 | ||||
| -rw-r--r-- | http/Makefile | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/http/ChangeLog b/http/ChangeLog index 0d5d49b..c13578f 100644 --- a/http/ChangeLog +++ b/http/ChangeLog @@ -1,3 +1,7 @@ +2007-11-06 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile: Switch to using rtems-bin2c for initial filesystem image. + 2007-09-07 Joel Sherrill <joel.sherrill@oarcorp.com> * shttpd_index.html: Fix URL for shttpd. diff --git a/http/Makefile b/http/Makefile index 7c64dc4..e6e3d28 100644 --- a/http/Makefile +++ b/http/Makefile @@ -40,9 +40,6 @@ CFLAGS_DEBUG_V += -v -qrtems_debug LD_PATHS += -#NATIVE_OBJ = $(shell $(OBJCOPY) 2>&1 | grep copy: | cut -d':' -f3 | cut -d' ' -f2) -OBJDUMP=$(OBJCOPY:copy=dump) - USE_GOHEAD=no USE_SIMPLE=yes USE_FTPD=yes @@ -76,17 +73,12 @@ CLEAN_ADDITIONS += FilesystemImage FilesystemImage.c FilesystemImage.h CLEAN_ADDITIONS += stamp-index-html rootfs/index.html rootfs/shttpd.png CLOBBER_ADDITIONS += -# strip out flags gcc knows but LD doesn't like -- add as needed -LD_CPU_CFLAGS=$(CPU_CFLAGS:-mstrict-align:) - -COPY_ARCH=$(shell echo $(OBJCOPY) | cut -d'-' -f1) - all: ${ARCH} $(SRCS) $(PGM) ${PGM}: $(OBJS) $(LINK_FILES) $(make-exe) -$(ARCH)/init.c: init.c FilesystemImage.c +$(ARCH)/init.o: init.c FilesystemImage.c FilesystemImage: $(ARCH) stamp-index-html \ rootfs/etc/host.conf rootfs/etc/hosts rootfs/rtems_logo.jpg |