diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-06 15:19:08 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-06 15:19:08 +0000 |
| commit | c2b3e1718f30736666d886178adf4c547466f80e (patch) | |
| tree | 7674053c63e6e7f800c1af06aa8d5f88026f39ae /cpukit | |
| parent | 2007-12-06 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-c2b3e1718f30736666d886178adf4c547466f80e.tar.bz2 | |
2007-12-06 Joel Sherrill <joel.sherrill@OARcorp.com>
* httpd/Makefile.am, httpd/preinstall.am: rtems_webserver.h must be
installed. It is the initialization interface for both GoAhead and
Simple HTTPD.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/httpd/Makefile.am | 4 | ||||
| -rw-r--r-- | cpukit/httpd/preinstall.am | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 01a01dc6df..d1cc1ff481 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2007-12-06 Joel Sherrill <joel.sherrill@OARcorp.com> + + * httpd/Makefile.am, httpd/preinstall.am: rtems_webserver.h must be + installed. It is the initialization interface for both GoAhead and + Simple HTTPD. + 2007-12-05 Joel Sherrill <joel.sherrill@oarcorp.com> * sapi/include/rtems/config.h: Correct previous commit. diff --git a/cpukit/httpd/Makefile.am b/cpukit/httpd/Makefile.am index 9613466871..7eb2ed7124 100644 --- a/cpukit/httpd/Makefile.am +++ b/cpukit/httpd/Makefile.am @@ -7,10 +7,12 @@ include $(top_srcdir)/automake/compile.am AM_CPPFLAGS += -DWEBS -DUEMF if LIBNETWORKING +## Always install this header file. Both webservers use it. +include_HEADERS = rtems_webserver.h + if HAS_PTHREADS include_goaheaddir = $(includedir)/goahead -include_HEADERS = rtems_webserver.h include_goahead_HEADERS = ej.h ejIntrn.h emfdb.h md5.h uemf.h um.h webs.h \ wsIntrn.h diff --git a/cpukit/httpd/preinstall.am b/cpukit/httpd/preinstall.am index e45371ba0d..ccc622b04a 100644 --- a/cpukit/httpd/preinstall.am +++ b/cpukit/httpd/preinstall.am @@ -29,16 +29,16 @@ $(PROJECT_INCLUDE)/$(dirstamp): PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) if LIBNETWORKING +$(PROJECT_INCLUDE)/rtems_webserver.h: rtems_webserver.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems_webserver.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems_webserver.h + if HAS_PTHREADS $(PROJECT_INCLUDE)/goahead/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/goahead @: > $(PROJECT_INCLUDE)/goahead/$(dirstamp) PREINSTALL_DIRS += $(PROJECT_INCLUDE)/goahead/$(dirstamp) -$(PROJECT_INCLUDE)/rtems_webserver.h: rtems_webserver.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems_webserver.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems_webserver.h - $(PROJECT_INCLUDE)/goahead/ej.h: ej.h $(PROJECT_INCLUDE)/goahead/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/goahead/ej.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/goahead/ej.h |