myserver-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[myserver-commit] [2839] Keep header files hierarchy with `make install'


From: Giuseppe Scrivano
Subject: [myserver-commit] [2839] Keep header files hierarchy with `make install'.
Date: Tue, 23 Sep 2008 21:00:57 +0000

Revision: 2839
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2839
Author:   gscrivano
Date:     2008-09-23 21:00:56 +0000 (Tue, 23 Sep 2008)

Log Message:
-----------
Keep header files hierarchy with `make install'.

Modified Paths:
--------------
    trunk/myserver/configure.in
    trunk/myserver/documentation/Makefile.am
    trunk/myserver/include/Makefile.am
    trunk/myserver/include/base/Makefile.am
    trunk/myserver/include/base/base64/Makefile.am
    trunk/myserver/include/base/dynamic_lib/Makefile.am
    trunk/myserver/include/base/file/Makefile.am
    trunk/myserver/include/base/files_cache/Makefile.am
    trunk/myserver/include/base/find_data/Makefile.am
    trunk/myserver/include/base/hash_map/Makefile.am
    trunk/myserver/include/base/home_dir/Makefile.am
    trunk/myserver/include/base/md5/Makefile.am
    trunk/myserver/include/base/mem_buff/Makefile.am
    trunk/myserver/include/base/multicast/Makefile.am
    trunk/myserver/include/base/pipe/Makefile.am
    trunk/myserver/include/base/process/Makefile.am
    trunk/myserver/include/base/regex/Makefile.am
    trunk/myserver/include/base/safetime/Makefile.am
    trunk/myserver/include/base/socket/Makefile.am
    trunk/myserver/include/base/ssl/Makefile.am
    trunk/myserver/include/base/string/Makefile.am
    trunk/myserver/include/base/sync/Makefile.am
    trunk/myserver/include/base/thread/Makefile.am
    trunk/myserver/include/base/xml/Makefile.am
    trunk/myserver/include/conf/Makefile.am
    trunk/myserver/include/conf/mime/Makefile.am
    trunk/myserver/include/conf/security/Makefile.am
    trunk/myserver/include/conf/vhost/Makefile.am
    trunk/myserver/include/connection/Makefile.am
    trunk/myserver/include/connections_scheduler/Makefile.am
    trunk/myserver/include/filter/Makefile.am
    trunk/myserver/include/filter/gzip/Makefile.am
    trunk/myserver/include/http_handler/Makefile.am
    trunk/myserver/include/http_handler/cgi/Makefile.am
    trunk/myserver/include/http_handler/fastcgi/Makefile.am
    trunk/myserver/include/http_handler/http_dir/Makefile.am
    trunk/myserver/include/http_handler/http_file/Makefile.am
    trunk/myserver/include/http_handler/isapi/Makefile.am
    trunk/myserver/include/http_handler/mscgi/Makefile.am
    trunk/myserver/include/http_handler/scgi/Makefile.am
    trunk/myserver/include/http_handler/wincgi/Makefile.am
    trunk/myserver/include/log/Makefile.am
    trunk/myserver/include/log/stream/Makefile.am
    trunk/myserver/include/plugin/Makefile.am
    trunk/myserver/include/plugin/executor/Makefile.am
    trunk/myserver/include/plugin/filter/Makefile.am
    trunk/myserver/include/plugin/http_command/Makefile.am
    trunk/myserver/include/plugin/http_manager/Makefile.am
    trunk/myserver/include/plugin/protocol/Makefile.am
    trunk/myserver/include/protocol/Makefile.am
    trunk/myserver/include/protocol/control/Makefile.am
    trunk/myserver/include/protocol/ftp/Makefile.am
    trunk/myserver/include/protocol/http/Makefile.am
    trunk/myserver/include/protocol/http/env/Makefile.am
    trunk/myserver/include/protocol/https/Makefile.am
    trunk/myserver/include/server/Makefile.am

Modified: trunk/myserver/configure.in
===================================================================
--- trunk/myserver/configure.in 2008-09-23 19:47:41 UTC (rev 2838)
+++ trunk/myserver/configure.in 2008-09-23 21:00:56 UTC (rev 2839)
@@ -53,14 +53,12 @@
 
 AC_ARG_WITH([root-prefix], [  --with-root-prefix=PREFIX override prefix 
variable for files to be placed in the root], root_prefix=$withval, 
root_prefix="\$(DESTDIR)")
 
-
 AC_ARG_ENABLE([control-gui], [ --disable-control-gui disable the 
myserver-configure GUI program], enable_control="no", enable_control="yes")
 
 AC_ARG_ENABLE([ipv6], [  --enable-ipv6 Build with IPv6 support], 
enable_ipv6="yes", enable_ipv6="")
 
 AC_ARG_ENABLE([mingw32], [ --enable-mingw32 Enable mingw32], 
enable_mingw32="yes", enable_mingw32="")
 
-
 root_bindir='${root_prefix}/bin'
 root_sbindir='${root_prefix}/sbin'
 root_sysconfdir='${root_prefix}/etc'
@@ -70,13 +68,6 @@
 AC_SUBST(root_sbindir)
 AC_SUBST(root_sysconfdir)
 
-
-AC_ARG_WITH([myserver-headers], [  --with-myserver-headers=path Override the 
myserver headers location (used by modules)], MYSERVER_HEADERS=$withval, 
MYSERVER_HEADERS="`pwd`")
-
-AC_SUBST(MYSERVER_HEADERS)
-AC_SUBST(MSCGI_HEADERS)
-
-
 dnl Looking for argp.h
 AC_CHECK_HEADER([argp.h], AC_DEFINE(ARGP, 1, [Define if GNU argp tools are 
available]))
 

Modified: trunk/myserver/documentation/Makefile.am
===================================================================
--- trunk/myserver/documentation/Makefile.am    2008-09-23 19:47:41 UTC (rev 
2838)
+++ trunk/myserver/documentation/Makefile.am    2008-09-23 21:00:56 UTC (rev 
2839)
@@ -3,4 +3,4 @@
 #any other .texi that is not myserver.texi
 myserver_TEXINFOS=basic_configuration.texi  doclicense.texi mime_types.texi  
gpl.texi  process_security.texi virtual_hosts.texi ssl_certificates.texi
 
-SUBDIRS = english
+SUBDIRS = 

Modified: trunk/myserver/include/Makefile.am
===================================================================
--- trunk/myserver/include/Makefile.am  2008-09-23 19:47:41 UTC (rev 2838)
+++ trunk/myserver/include/Makefile.am  2008-09-23 21:00:56 UTC (rev 2839)
@@ -1,2 +1,4 @@
+includeincludedir=$(includedir)/myserver/include/find_data
+includeinclude_HEADERS =
 SUBDIRS = base conf connection connections_scheduler filter http_handler log 
plugin protocol server
 

Modified: trunk/myserver/include/base/Makefile.am
===================================================================
--- trunk/myserver/include/base/Makefile.am     2008-09-23 19:47:41 UTC (rev 
2838)
+++ trunk/myserver/include/base/Makefile.am     2008-09-23 21:00:56 UTC (rev 
2839)
@@ -1,3 +1,4 @@
-include_HEADERS = utility.h
+baseincludedir=$(includedir)/myserver/include/base
+baseinclude_HEADERS = utility.h
 SUBDIRS = base64 dynamic_lib file files_cache find_data hash_map home_dir md5 
mem_buff multicast pipe process regex safetime socket ssl string sync thread xml
 

Modified: trunk/myserver/include/base/base64/Makefile.am
===================================================================
--- trunk/myserver/include/base/base64/Makefile.am      2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/base/base64/Makefile.am      2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = mime_utils.h
+base64includedir=$(includedir)/myserver/include/base/base64
+base64include_HEADERS = mime_utils.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/dynamic_lib/Makefile.am
===================================================================
--- trunk/myserver/include/base/dynamic_lib/Makefile.am 2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/base/dynamic_lib/Makefile.am 2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = dynamiclib.h
+dynamic_libincludedir=$(includedir)/myserver/include/base/dynamic_lib
+dynamic_libinclude_HEADERS = dynamiclib.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/file/Makefile.am
===================================================================
--- trunk/myserver/include/base/file/Makefile.am        2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/base/file/Makefile.am        2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = file.h files_utility.h
+fileincludedir=$(includedir)/myserver/include/base/file
+fileinclude_HEADERS = file.h files_utility.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/files_cache/Makefile.am
===================================================================
--- trunk/myserver/include/base/files_cache/Makefile.am 2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/base/files_cache/Makefile.am 2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = cached_file_buffer.h cached_file_factory.h cached_file.h
+files_cacheincludedir=$(includedir)/myserver/include/base/files_cache
+files_cacheinclude_HEADERS = cached_file_buffer.h cached_file_factory.h 
cached_file.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/find_data/Makefile.am
===================================================================
--- trunk/myserver/include/base/find_data/Makefile.am   2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/base/find_data/Makefile.am   2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = find_data.h
+find_dataincludedir=$(includedir)/myserver/include/base/find_data
+find_datainclude_HEADERS = find_data.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/hash_map/Makefile.am
===================================================================
--- trunk/myserver/include/base/hash_map/Makefile.am    2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/base/hash_map/Makefile.am    2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = hash_map.h
+hash_mapincludedir=$(includedir)/myserver/include/base/hash_map
+hash_mapinclude_HEADERS = hash_map.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/home_dir/Makefile.am
===================================================================
--- trunk/myserver/include/base/home_dir/Makefile.am    2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/base/home_dir/Makefile.am    2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = home_dir.h
+home_dirincludedir=$(includedir)/myserver/include/base/home_dir
+home_dirinclude_HEADERS = home_dir.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/md5/Makefile.am
===================================================================
--- trunk/myserver/include/base/md5/Makefile.am 2008-09-23 19:47:41 UTC (rev 
2838)
+++ trunk/myserver/include/base/md5/Makefile.am 2008-09-23 21:00:56 UTC (rev 
2839)
@@ -1,3 +1,4 @@
-include_HEADERS = md5.h
+md5includedir=$(includedir)/myserver/include/base/md5
+md5include_HEADERS = md5.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/mem_buff/Makefile.am
===================================================================
--- trunk/myserver/include/base/mem_buff/Makefile.am    2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/base/mem_buff/Makefile.am    2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = mem_buff.h
+mem_buffincludedir=$(includedir)/myserver/include/base/mem_buff
+mem_buffinclude_HEADERS = mem_buff.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/multicast/Makefile.am
===================================================================
--- trunk/myserver/include/base/multicast/Makefile.am   2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/base/multicast/Makefile.am   2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = multicast.h
+multicastincludedir=$(includedir)/myserver/include/base/multicast
+multicastinclude_HEADERS = multicast.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/pipe/Makefile.am
===================================================================
--- trunk/myserver/include/base/pipe/Makefile.am        2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/base/pipe/Makefile.am        2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = pipe.h
+pipeincludedir=$(includedir)/myserver/include/base/pipe
+pipeinclude_HEADERS = pipe.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/process/Makefile.am
===================================================================
--- trunk/myserver/include/base/process/Makefile.am     2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/base/process/Makefile.am     2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = process.h process_server_manager.h
+processincludedir=$(includedir)/myserver/include/base/process
+processinclude_HEADERS = process.h process_server_manager.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/regex/Makefile.am
===================================================================
--- trunk/myserver/include/base/regex/Makefile.am       2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/base/regex/Makefile.am       2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = myserver_regex.h
+regexincludedir=$(includedir)/myserver/include/base/regex
+regexinclude_HEADERS = myserver_regex.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/safetime/Makefile.am
===================================================================
--- trunk/myserver/include/base/safetime/Makefile.am    2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/base/safetime/Makefile.am    2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = safetime.h
+safetimeincludedir=$(includedir)/myserver/include/base/safetime
+safetimeinclude_HEADERS = safetime.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/socket/Makefile.am
===================================================================
--- trunk/myserver/include/base/socket/Makefile.am      2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/base/socket/Makefile.am      2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = socket.h ssl_socket.h
+socketincludedir=$(includedir)/myserver/include/base/socket
+socketinclude_HEADERS = socket.h ssl_socket.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/ssl/Makefile.am
===================================================================
--- trunk/myserver/include/base/ssl/Makefile.am 2008-09-23 19:47:41 UTC (rev 
2838)
+++ trunk/myserver/include/base/ssl/Makefile.am 2008-09-23 21:00:56 UTC (rev 
2839)
@@ -1,3 +1,4 @@
-include_HEADERS = ssl.h
+sslincludedir=$(includedir)/myserver/include/base/ssl
+sslinclude_HEADERS = ssl.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/string/Makefile.am
===================================================================
--- trunk/myserver/include/base/string/Makefile.am      2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/base/string/Makefile.am      2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = securestr.h stringutils.h
+stringincludedir=$(includedir)/myserver/include/base/string
+stringinclude_HEADERS = securestr.h stringutils.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/sync/Makefile.am
===================================================================
--- trunk/myserver/include/base/sync/Makefile.am        2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/base/sync/Makefile.am        2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = event.h mutex.h read_write_lock.h recursive_mutex.h 
semaphore.h
+syncincludedir=$(includedir)/myserver/include/base/sync
+syncinclude_HEADERS = event.h mutex.h read_write_lock.h recursive_mutex.h 
semaphore.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/thread/Makefile.am
===================================================================
--- trunk/myserver/include/base/thread/Makefile.am      2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/base/thread/Makefile.am      2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = thread.h
+threadincludedir=$(includedir)/myserver/include/base/thread
+threadinclude_HEADERS = thread.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/xml/Makefile.am
===================================================================
--- trunk/myserver/include/base/xml/Makefile.am 2008-09-23 19:47:41 UTC (rev 
2838)
+++ trunk/myserver/include/base/xml/Makefile.am 2008-09-23 21:00:56 UTC (rev 
2839)
@@ -1,3 +1,4 @@
-include_HEADERS = xml_parser.h
+xmlincludedir=$(includedir)/myserver/include/base/xml
+xmlinclude_HEADERS = xml_parser.h
 SUBDIRS =
 

Modified: trunk/myserver/include/conf/Makefile.am
===================================================================
--- trunk/myserver/include/conf/Makefile.am     2008-09-23 19:47:41 UTC (rev 
2838)
+++ trunk/myserver/include/conf/Makefile.am     2008-09-23 21:00:56 UTC (rev 
2839)
@@ -1,3 +1,4 @@
-include_HEADERS =
+confincludedir=$(includedir)/myserver/include/conf
+confinclude_HEADERS =
 SUBDIRS = mime security vhost
 

Modified: trunk/myserver/include/conf/mime/Makefile.am
===================================================================
--- trunk/myserver/include/conf/mime/Makefile.am        2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/conf/mime/Makefile.am        2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = mime_manager.h
+mimeincludedir=$(includedir)/myserver/include/conf/mime
+mimeinclude_HEADERS = mime_manager.h
 SUBDIRS =
 

Modified: trunk/myserver/include/conf/security/Makefile.am
===================================================================
--- trunk/myserver/include/conf/security/Makefile.am    2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/conf/security/Makefile.am    2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = security_cache.h security.h
+securityincludedir=$(includedir)/myserver/include/conf/security
+securityinclude_HEADERS = security_cache.h security.h
 SUBDIRS =
 

Modified: trunk/myserver/include/conf/vhost/Makefile.am
===================================================================
--- trunk/myserver/include/conf/vhost/Makefile.am       2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/conf/vhost/Makefile.am       2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = vhost.h vhost_manager.h
+vhostincludedir=$(includedir)/myserver/include/conf/vhost
+vhostinclude_HEADERS = vhost.h vhost_manager.h
 SUBDIRS =
 

Modified: trunk/myserver/include/connection/Makefile.am
===================================================================
--- trunk/myserver/include/connection/Makefile.am       2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/connection/Makefile.am       2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = connection.h
+connectionincludedir=$(includedir)/myserver/include/connection
+connectioninclude_HEADERS = connection.h
 SUBDIRS =
 

Modified: trunk/myserver/include/connections_scheduler/Makefile.am
===================================================================
--- trunk/myserver/include/connections_scheduler/Makefile.am    2008-09-23 
19:47:41 UTC (rev 2838)
+++ trunk/myserver/include/connections_scheduler/Makefile.am    2008-09-23 
21:00:56 UTC (rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = connections_scheduler.h listen_threads.h
+connections_schedulerincludedir=$(includedir)/myserver/include/connections_scheduler
+connections_schedulerinclude_HEADERS = connections_scheduler.h listen_threads.h
 SUBDIRS =
 

Modified: trunk/myserver/include/filter/Makefile.am
===================================================================
--- trunk/myserver/include/filter/Makefile.am   2008-09-23 19:47:41 UTC (rev 
2838)
+++ trunk/myserver/include/filter/Makefile.am   2008-09-23 21:00:56 UTC (rev 
2839)
@@ -1,3 +1,4 @@
-include_HEADERS = filter.h filters_chain.h filters_factory.h memory_stream.h 
stream.h console.h
+filterincludedir=$(includedir)/myserver/include/filter
+filterinclude_HEADERS = console.h filter.h filters_chain.h filters_factory.h 
memory_stream.h stream.h
 SUBDIRS = gzip
 

Modified: trunk/myserver/include/filter/gzip/Makefile.am
===================================================================
--- trunk/myserver/include/filter/gzip/Makefile.am      2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/filter/gzip/Makefile.am      2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = gzip_decompress.h gzip.h
+gzipincludedir=$(includedir)/myserver/include/filter/gzip
+gzipinclude_HEADERS = gzip_decompress.h gzip.h
 SUBDIRS =
 

Modified: trunk/myserver/include/http_handler/Makefile.am
===================================================================
--- trunk/myserver/include/http_handler/Makefile.am     2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/http_handler/Makefile.am     2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS =
+http_handlerincludedir=$(includedir)/myserver/include/http_handler
+http_handlerinclude_HEADERS =
 SUBDIRS = cgi fastcgi http_dir http_file isapi mscgi scgi wincgi
 

Modified: trunk/myserver/include/http_handler/cgi/Makefile.am
===================================================================
--- trunk/myserver/include/http_handler/cgi/Makefile.am 2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/http_handler/cgi/Makefile.am 2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = cgi.h
+cgiincludedir=$(includedir)/myserver/include/http_handler/cgi
+cgiinclude_HEADERS = cgi.h
 SUBDIRS =
 

Modified: trunk/myserver/include/http_handler/fastcgi/Makefile.am
===================================================================
--- trunk/myserver/include/http_handler/fastcgi/Makefile.am     2008-09-23 
19:47:41 UTC (rev 2838)
+++ trunk/myserver/include/http_handler/fastcgi/Makefile.am     2008-09-23 
21:00:56 UTC (rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = fastcgi.h
+fastcgiincludedir=$(includedir)/myserver/include/http_handler/fastcgi
+fastcgiinclude_HEADERS = fastcgi.h
 SUBDIRS =
 

Modified: trunk/myserver/include/http_handler/http_dir/Makefile.am
===================================================================
--- trunk/myserver/include/http_handler/http_dir/Makefile.am    2008-09-23 
19:47:41 UTC (rev 2838)
+++ trunk/myserver/include/http_handler/http_dir/Makefile.am    2008-09-23 
21:00:56 UTC (rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = http_dir.h
+http_dirincludedir=$(includedir)/myserver/include/http_handler/http_dir
+http_dirinclude_HEADERS = http_dir.h
 SUBDIRS =
 

Modified: trunk/myserver/include/http_handler/http_file/Makefile.am
===================================================================
--- trunk/myserver/include/http_handler/http_file/Makefile.am   2008-09-23 
19:47:41 UTC (rev 2838)
+++ trunk/myserver/include/http_handler/http_file/Makefile.am   2008-09-23 
21:00:56 UTC (rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = http_file.h
+http_fileincludedir=$(includedir)/myserver/include/http_handler/http_file
+http_fileinclude_HEADERS = http_file.h
 SUBDIRS =
 

Modified: trunk/myserver/include/http_handler/isapi/Makefile.am
===================================================================
--- trunk/myserver/include/http_handler/isapi/Makefile.am       2008-09-23 
19:47:41 UTC (rev 2838)
+++ trunk/myserver/include/http_handler/isapi/Makefile.am       2008-09-23 
21:00:56 UTC (rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = isapi.h
+isapiincludedir=$(includedir)/myserver/include/http_handler/isapi
+isapiinclude_HEADERS = isapi.h
 SUBDIRS =
 

Modified: trunk/myserver/include/http_handler/mscgi/Makefile.am
===================================================================
--- trunk/myserver/include/http_handler/mscgi/Makefile.am       2008-09-23 
19:47:41 UTC (rev 2838)
+++ trunk/myserver/include/http_handler/mscgi/Makefile.am       2008-09-23 
21:00:56 UTC (rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = mscgi.h mscgi_manager.h
+mscgiincludedir=$(includedir)/myserver/include/http_handler/mscgi
+mscgiinclude_HEADERS = mscgi.h mscgi_manager.h
 SUBDIRS =
 

Modified: trunk/myserver/include/http_handler/scgi/Makefile.am
===================================================================
--- trunk/myserver/include/http_handler/scgi/Makefile.am        2008-09-23 
19:47:41 UTC (rev 2838)
+++ trunk/myserver/include/http_handler/scgi/Makefile.am        2008-09-23 
21:00:56 UTC (rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = scgi.h
+scgiincludedir=$(includedir)/myserver/include/http_handler/scgi
+scgiinclude_HEADERS = scgi.h
 SUBDIRS =
 

Modified: trunk/myserver/include/http_handler/wincgi/Makefile.am
===================================================================
--- trunk/myserver/include/http_handler/wincgi/Makefile.am      2008-09-23 
19:47:41 UTC (rev 2838)
+++ trunk/myserver/include/http_handler/wincgi/Makefile.am      2008-09-23 
21:00:56 UTC (rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = wincgi.h
+wincgiincludedir=$(includedir)/myserver/include/http_handler/wincgi
+wincgiinclude_HEADERS = wincgi.h
 SUBDIRS =
 

Modified: trunk/myserver/include/log/Makefile.am
===================================================================
--- trunk/myserver/include/log/Makefile.am      2008-09-23 19:47:41 UTC (rev 
2838)
+++ trunk/myserver/include/log/Makefile.am      2008-09-23 21:00:56 UTC (rev 
2839)
@@ -1,3 +1,4 @@
-include_HEADERS = log_manager.h
+logincludedir=$(includedir)/myserver/include/log
+loginclude_HEADERS = log_manager.h
 SUBDIRS = stream
 

Modified: trunk/myserver/include/log/stream/Makefile.am
===================================================================
--- trunk/myserver/include/log/stream/Makefile.am       2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/log/stream/Makefile.am       2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,5 +1,4 @@
-include_HEADERS = console_stream.h file_stream.h log_stream.h \
-               log_stream_factory.h log_stream_creator.h \
-               file_stream_creator.h console_stream_creator.h \
-               socket_stream.h socket_stream_creator.h
-SUBDIRS = 
+streamincludedir=$(includedir)/myserver/include/log/stream
+streaminclude_HEADERS = console_stream_creator.h console_stream.h 
file_stream_creator.h file_stream.h log_stream_creator.h log_stream_factory.h 
log_stream.h socket_stream_creator.h socket_stream.h
+SUBDIRS =
+

Modified: trunk/myserver/include/plugin/Makefile.am
===================================================================
--- trunk/myserver/include/plugin/Makefile.am   2008-09-23 19:47:41 UTC (rev 
2838)
+++ trunk/myserver/include/plugin/Makefile.am   2008-09-23 21:00:56 UTC (rev 
2839)
@@ -1,3 +1,4 @@
-include_HEADERS = generic_plugins_manager.h plugin.h plugins_manager.h 
plugins_namespace.h plugins_namespace_manager.h
+pluginincludedir=$(includedir)/myserver/include/plugin
+plugininclude_HEADERS = generic_plugins_manager.h plugin.h plugins_manager.h 
plugins_namespace.h plugins_namespace_manager.h
 SUBDIRS = executor filter http_command http_manager protocol
 

Modified: trunk/myserver/include/plugin/executor/Makefile.am
===================================================================
--- trunk/myserver/include/plugin/executor/Makefile.am  2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/plugin/executor/Makefile.am  2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = dynamic_executor.h dyn_executor_manager.h
+executorincludedir=$(includedir)/myserver/include/plugin/executor
+executorinclude_HEADERS = dynamic_executor.h dyn_executor_manager.h
 SUBDIRS =
 

Modified: trunk/myserver/include/plugin/filter/Makefile.am
===================================================================
--- trunk/myserver/include/plugin/filter/Makefile.am    2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/plugin/filter/Makefile.am    2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = dyn_filter_file.h dyn_filter.h dyn_filters_manager.h
+filterincludedir=$(includedir)/myserver/include/plugin/filter
+filterinclude_HEADERS = dyn_filter_file.h dyn_filter.h dyn_filters_manager.h
 SUBDIRS =
 

Modified: trunk/myserver/include/plugin/http_command/Makefile.am
===================================================================
--- trunk/myserver/include/plugin/http_command/Makefile.am      2008-09-23 
19:47:41 UTC (rev 2838)
+++ trunk/myserver/include/plugin/http_command/Makefile.am      2008-09-23 
21:00:56 UTC (rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = dyn_http_command.h dyn_http_command_manager.h
+http_commandincludedir=$(includedir)/myserver/include/plugin/http_command
+http_commandinclude_HEADERS = dyn_http_command.h dyn_http_command_manager.h
 SUBDIRS =
 

Modified: trunk/myserver/include/plugin/http_manager/Makefile.am
===================================================================
--- trunk/myserver/include/plugin/http_manager/Makefile.am      2008-09-23 
19:47:41 UTC (rev 2838)
+++ trunk/myserver/include/plugin/http_manager/Makefile.am      2008-09-23 
21:00:56 UTC (rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = dyn_http_manager.h dyn_http_manager_list.h
+http_managerincludedir=$(includedir)/myserver/include/plugin/http_manager
+http_managerinclude_HEADERS = dyn_http_manager.h dyn_http_manager_list.h
 SUBDIRS =
 

Modified: trunk/myserver/include/plugin/protocol/Makefile.am
===================================================================
--- trunk/myserver/include/plugin/protocol/Makefile.am  2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/plugin/protocol/Makefile.am  2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = dynamic_protocol.h protocols_manager.h
+protocolincludedir=$(includedir)/myserver/include/plugin/protocol
+protocolinclude_HEADERS = dynamic_protocol.h protocols_manager.h
 SUBDIRS =
 

Modified: trunk/myserver/include/protocol/Makefile.am
===================================================================
--- trunk/myserver/include/protocol/Makefile.am 2008-09-23 19:47:41 UTC (rev 
2838)
+++ trunk/myserver/include/protocol/Makefile.am 2008-09-23 21:00:56 UTC (rev 
2839)
@@ -1,3 +1,4 @@
-include_HEADERS = protocol_buffer.h protocol.h
+protocolincludedir=$(includedir)/myserver/include/protocol
+protocolinclude_HEADERS = protocol_buffer.h protocol.h
 SUBDIRS = control ftp http https
 

Modified: trunk/myserver/include/protocol/control/Makefile.am
===================================================================
--- trunk/myserver/include/protocol/control/Makefile.am 2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/protocol/control/Makefile.am 2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = control_errors.h control_header.h control_protocol.h
+controlincludedir=$(includedir)/myserver/include/protocol/control
+controlinclude_HEADERS = control_errors.h control_header.h control_protocol.h
 SUBDIRS =
 

Modified: trunk/myserver/include/protocol/ftp/Makefile.am
===================================================================
--- trunk/myserver/include/protocol/ftp/Makefile.am     2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/protocol/ftp/Makefile.am     2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = ftp_common.h ftp.h ftp_lexer.h ftp_parser.h
+ftpincludedir=$(includedir)/myserver/include/protocol/ftp
+ftpinclude_HEADERS = ftp_common.h ftp.h ftp_lexer.h ftp_parser.h
 SUBDIRS =
 

Modified: trunk/myserver/include/protocol/http/Makefile.am
===================================================================
--- trunk/myserver/include/protocol/http/Makefile.am    2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/protocol/http/Makefile.am    2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = http_data_handler.h http_data_read.h http_errors.h http.h 
http_header_checker.h http_header.h http_headers.h http_request.h 
http_response.h http_thread_context.h
+httpincludedir=$(includedir)/myserver/include/protocol/http
+httpinclude_HEADERS = http_data_handler.h http_data_read.h http_errors.h 
http.h http_header_checker.h http_header.h http_headers.h http_request.h 
http_response.h http_thread_context.h
 SUBDIRS = env
 

Modified: trunk/myserver/include/protocol/http/env/Makefile.am
===================================================================
--- trunk/myserver/include/protocol/http/env/Makefile.am        2008-09-23 
19:47:41 UTC (rev 2838)
+++ trunk/myserver/include/protocol/http/env/Makefile.am        2008-09-23 
21:00:56 UTC (rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = env.h
+envincludedir=$(includedir)/myserver/include/protocol/http/env
+envinclude_HEADERS = env.h
 SUBDIRS =
 

Modified: trunk/myserver/include/protocol/https/Makefile.am
===================================================================
--- trunk/myserver/include/protocol/https/Makefile.am   2008-09-23 19:47:41 UTC 
(rev 2838)
+++ trunk/myserver/include/protocol/https/Makefile.am   2008-09-23 21:00:56 UTC 
(rev 2839)
@@ -1,3 +1,4 @@
-include_HEADERS = https.h
+httpsincludedir=$(includedir)/myserver/include/protocol/https
+httpsinclude_HEADERS = https.h
 SUBDIRS =
 

Modified: trunk/myserver/include/server/Makefile.am
===================================================================
--- trunk/myserver/include/server/Makefile.am   2008-09-23 19:47:41 UTC (rev 
2838)
+++ trunk/myserver/include/server/Makefile.am   2008-09-23 21:00:56 UTC (rev 
2839)
@@ -1,3 +1,4 @@
-include_HEADERS = clients_thread.h server.h
+serverincludedir=$(includedir)/myserver/include/server
+serverinclude_HEADERS = clients_thread.h server.h
 SUBDIRS =
 






reply via email to

[Prev in Thread] Current Thread [Next in Thread]