diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-06-21 18:00:27 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-06-21 18:00:27 +0000 |
| commit | cf5b3fa1015819a38355cd9678463df9a084259d (patch) | |
| tree | 3c8203bb96e00eb8c197735a9b31c49cd0dad89d | |
| parent | faa85e62a27edadf79e3b05b5431ab1407395274 (diff) | |
2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile, init.c, system.h: Now compiles reasonably cleanly with CVS
head.
| -rw-r--r-- | http/ChangeLog | 5 | ||||
| -rw-r--r-- | http/Makefile | 3 | ||||
| -rw-r--r-- | http/init.c | 3 | ||||
| -rw-r--r-- | http/system.h | 8 |
4 files changed, 10 insertions, 9 deletions
diff --git a/http/ChangeLog b/http/ChangeLog index 5a7a256..179a5a1 100644 --- a/http/ChangeLog +++ b/http/ChangeLog @@ -1,5 +1,10 @@ 2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com> + * Makefile, init.c, system.h: Now compiles reasonably cleanly with CVS + head. + +2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com> + * init.c, system.h: confdefs.h should be rtems/confdefs.h 2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com> diff --git a/http/Makefile b/http/Makefile index 2343b60..33bb20e 100644 --- a/http/Makefile +++ b/http/Makefile @@ -40,7 +40,8 @@ CFLAGS_OPTIMIZE_V += CFLAGS_DEBUG_V += -v -qrtems_debug LD_PATHS += -LD_LIBS += +LD_LIBS += -lhttpd +LD_LIBS += -lftpd NATIVE_OBJ = $(shell $(OBJCOPY) 2>&1 | grep copy: | cut -d':' -f3 | cut -d' ' -f2) # diff --git a/http/init.c b/http/init.c index 6a0f72a..43d8f42 100644 --- a/http/init.c +++ b/http/init.c @@ -38,7 +38,8 @@ #include <rtems/confdefs.h> #include <stdio.h> #include <rtems/rtems_bsdnet.h> -#include <ftpd.h> +#include <rtems/ftpd.h> +#include <rtems/untar.h> #include <rtems/error.h> diff --git a/http/system.h b/http/system.h index c88c0fc..91fd5cd 100644 --- a/http/system.h +++ b/http/system.h @@ -9,12 +9,10 @@ * * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at - * http://www.OARcorp.com/rtems/license.html. - * * $Id$ */ -#include <tmacros.h> +#include <rtems.h> /* functions */ @@ -26,8 +24,4 @@ rtems_task Init( #include <rtems/confdefs.h> -/* global variables */ - -TEST_EXTERN rtems_id Global_variable; /* example global variable */ - /* end of include file */ |