2009-05-18 Joel Sherrill <joel.sherrill@OARcorp.com>

	* Makefile, init.c, system.h: Allow overrides from invoking
	environment. Also move RTEMS Configuration to bottom of init.c.

4 files changed, 34 insertions, 35 deletions

diff --git a/http/ChangeLog b/http/ChangeLog
index 5575912..6ab7d4c 100644
--- a/http/ChangeLog
+++ b/http/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-18	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* Makefile, init.c, system.h: Allow overrides from invoking
+	environment. Also move RTEMS Configuration to bottom of init.c.
+
 2008-09-26	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* init.c: Eliminate boolean for bool.
diff --git a/http/Makefile b/http/Makefile
index 737bf74..bc657bf 100644
--- a/http/Makefile
+++ b/http/Makefile
@@ -32,7 +32,7 @@ include $(PROJECT_ROOT)/make/leaf.cfg
 # (OPTIONAL) Add local stuff here using +=
 #
 
-DEFINES  +=
+override DEFINES  +=
 CPPFLAGS +=
 CFLAGS_LD += -Wl,--defsym -Wl,HeapSize=0xC0000 
 CFLAGS_OPTIMIZE_V   +=
@@ -47,22 +47,20 @@ USE_FTPD=yes
 ifeq ($(USE_GOHEAD),yes)
   HTTPD     = GoAhead Web Server
   CFLAGS   += -DWEBS -DUEMF -DUSE_GOAHEAD_HTTPD
-  LD_LIBS  += -lhttpd
+  override LD_LIBS  += -lhttpd
 endif
 
 ifeq ($(USE_SIMPLE),yes)
   HTTPD     = Simple HTTPD Web Server
   CFLAGS   += -DUSE_SIMPLE_HTTPD
-  LD_LIBS  += -lshttpd
+  override LD_LIBS  += -lshttpd
 endif
 
 ifeq ($(USE_FTPD),yes)
   CFLAGS   += -DUSE_FTPD
-  LD_LIBS  += -lftpd
+  override LD_LIBS  += -lftpd
 endif
 
-LD_LIBS +=
-
 #
 # Add your list of files to delete here.  The config files
 #  already know how to delete some stuff, so you may want
diff --git a/http/init.c b/http/init.c
index 98611ac..718f60f 100644
--- a/http/init.c
+++ b/http/init.c
@@ -5,35 +5,12 @@
  *  Don't forget to change the IP addresses
  */
 
-#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS	20
-#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
-
-#define CONFIGURE_EXECUTIVE_RAM_SIZE	(512*1024)
-#define CONFIGURE_MAXIMUM_SEMAPHORES	20
-#define CONFIGURE_MAXIMUM_TASKS		20
-
-#define CONFIGURE_MICROSECONDS_PER_TICK	10000
-
-#define CONFIGURE_INIT_TASK_STACK_SIZE	(10*1024)
-#define CONFIGURE_INIT_TASK_PRIORITY	120
-#define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \
-                                           RTEMS_NO_TIMESLICE | \
-                                           RTEMS_NO_ASR | \
-                                           RTEMS_INTERRUPT_LEVEL(0))
-
-#define STACK_CHECKER_ON
-#define CONFIGURE_INIT
-
 #include "system.h"
 #include <bsp.h>
 
 #include <errno.h>
 #include <time.h>
 
-#include <rtems/confdefs.h>
 #include <stdio.h>
 #include <rtems/rtems_bsdnet.h>
 #include <rtems/ftpd.h>
@@ -172,5 +149,29 @@ rtems_task Init(
 }
 
 
+/*
+ *  Configuration
+ */
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS	20
+#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
+
+#define CONFIGURE_EXECUTIVE_RAM_SIZE	(512*1024)
+#define CONFIGURE_MAXIMUM_SEMAPHORES	20
+#define CONFIGURE_MAXIMUM_TASKS		20
 
+#define CONFIGURE_MICROSECONDS_PER_TICK	10000
 
+#define CONFIGURE_INIT_TASK_STACK_SIZE	(10*1024)
+#define CONFIGURE_INIT_TASK_PRIORITY	120
+#define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \
+                                           RTEMS_NO_TIMESLICE | \
+                                           RTEMS_NO_ASR | \
+                                           RTEMS_INTERRUPT_LEVEL(0))
+
+#define CONFIGURE_STACK_CHECKER_ENABLED
+#define CONFIGURE_INIT
+
+#include <rtems/confdefs.h>
diff --git a/http/system.h b/http/system.h
index 91fd5cd..273bd7c 100644
--- a/http/system.h
+++ b/http/system.h
@@ -3,9 +3,8 @@
  *  This include file contains information that is included in every
  *  function in the test set.
  *
- *  COPYRIGHT (c) 1989-1998.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
  *
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
@@ -20,8 +19,4 @@ rtems_task Init(
   rtems_task_argument argument
 );
 
-/* configuration information */
-
-#include <rtems/confdefs.h>
-
 /* end of include file */