diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-06 15:18:42 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-06 15:18:42 +0000 |
| commit | aa56c201141d6fe045325930ed89989c9db3872b (patch) | |
| tree | df2717789de9bd6eb9eb49e26f86bc7969ab9bef | |
| parent | 2007-12-06 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-aa56c201141d6fe045325930ed89989c9db3872b.tar.bz2 | |
2007-12-06 Joel Sherrill <joel.sherrill@OARcorp.com>
* httpd/Makefile.am, httpd/preinstall.am,
rtems/src/semtranslatereturncode.c: rtems_webserver.h must be
installed. It is the initialization interface for both GoAhead and
Simple HTTPD.
| -rw-r--r-- | cpukit/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/httpd/Makefile.am | 4 | ||||
| -rw-r--r-- | cpukit/httpd/preinstall.am | 8 |
3 files changed, 14 insertions, 5 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index dc74d0e7b2..79fb9c651c 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,10 @@ +2007-12-06 Joel Sherrill <joel.sherrill@OARcorp.com> + + * httpd/Makefile.am, httpd/preinstall.am, + rtems/src/semtranslatereturncode.c: rtems_webserver.h must be + installed. It is the initialization interface for both GoAhead and + Simple HTTPD. + 2007-12-05 Ralf Corsépius <ralf.corsepius@rtems.org> * configure.ac: Remove score/cpu/avr/Makefile, 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 |