summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-06-21 18:00:31 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-06-21 18:00:31 +0000
commitcd62df5486261621bbe8f86ed791b9fcd934c24d (patch)
tree24b849b87600c47b2b2bdf7a63fd665cdf8c105c
parent2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com> (diff)
downloadnetwork-demos-cd62df5486261621bbe8f86ed791b9fcd934c24d.tar.bz2
2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile, init.c: Now compiles reasonably cleanly with CVS head.
-rw-r--r--netlink/ChangeLog4
-rw-r--r--netlink/Makefile3
-rw-r--r--netlink/init.c4
3 files changed, 7 insertions, 4 deletions
diff --git a/netlink/ChangeLog b/netlink/ChangeLog
index 0f0afe5..5b6dae9 100644
--- a/netlink/ChangeLog
+++ b/netlink/ChangeLog
@@ -1,5 +1,9 @@
2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com>
+ * Makefile, init.c: 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/netlink/Makefile b/netlink/Makefile
index 81a118e..9245081 100644
--- a/netlink/Makefile
+++ b/netlink/Makefile
@@ -35,13 +35,12 @@ include $(PROJECT_ROOT)/make/leaf.cfg
DEFINES +=
CPPFLAGS +=
CFLAGS +=
-CFLAGS_LD +=
# CFLAGS_LD += -Wl,--defsym -Wl,HeapSize=0xC0000
CFLAGS_OPTIMIZE_V +=
CFLAGS_DEBUG_V += -v -qrtems_debug
LD_PATHS +=
-LD_LIBS +=
+LD_LIBS += -lhttpd
#
# Add your list of files to delete here. The config files
diff --git a/netlink/init.c b/netlink/init.c
index 3e8a5f9..43391ba 100644
--- a/netlink/init.c
+++ b/netlink/init.c
@@ -37,10 +37,10 @@ rtems_task Init(
#include <errno.h>
#include <time.h>
-#include <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>