myserver-commit
[Top][All Lists]
Advanced

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

[myserver-commit] [2779] use include_HEADERS instead of EXTRA_DIST for i


From: Giuseppe Scrivano
Subject: [myserver-commit] [2779] use include_HEADERS instead of EXTRA_DIST for include files
Date: Mon, 01 Sep 2008 19:56:40 +0000

Revision: 2779
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2779
Author:   gscrivano
Date:     2008-09-01 19:56:39 +0000 (Mon, 01 Sep 2008)

Log Message:
-----------
use include_HEADERS instead of EXTRA_DIST for include files

Modified Paths:
--------------
    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/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/env/Makefile.am
    trunk/myserver/include/files_cache/Makefile.am
    trunk/myserver/include/filter/Makefile.am
    trunk/myserver/include/filter/gzip/Makefile.am
    trunk/myserver/include/find_data/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/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/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/https/Makefile.am
    trunk/myserver/include/server/Makefile.am
    trunk/myserver/src/Makefile.am

Modified: trunk/myserver/include/Makefile.am
===================================================================
--- trunk/myserver/include/Makefile.am  2008-09-01 10:08:50 UTC (rev 2778)
+++ trunk/myserver/include/Makefile.am  2008-09-01 19:56:39 UTC (rev 2779)
@@ -1,3 +1,2 @@
-EXTRA_DIST =
 SUBDIRS = base conf connection connections_scheduler env files_cache filter 
find_data http_handler log plugin protocol server
 

Modified: trunk/myserver/include/base/Makefile.am
===================================================================
--- trunk/myserver/include/base/Makefile.am     2008-09-01 10:08:50 UTC (rev 
2778)
+++ trunk/myserver/include/base/Makefile.am     2008-09-01 19:56:39 UTC (rev 
2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = utility.h
+include_HEADERS = utility.h
 SUBDIRS = base64 dynamic_lib file 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-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/base/base64/Makefile.am      2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = mime_utils.h
+include_HEADERS = mime_utils.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/dynamic_lib/Makefile.am
===================================================================
--- trunk/myserver/include/base/dynamic_lib/Makefile.am 2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/base/dynamic_lib/Makefile.am 2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = dynamiclib.h
+include_HEADERS = dynamiclib.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/file/Makefile.am
===================================================================
--- trunk/myserver/include/base/file/Makefile.am        2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/base/file/Makefile.am        2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = file.h files_utility.h
+include_HEADERS = file.h files_utility.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/hash_map/Makefile.am
===================================================================
--- trunk/myserver/include/base/hash_map/Makefile.am    2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/base/hash_map/Makefile.am    2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = hash_map.h
+include_HEADERS = hash_map.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/home_dir/Makefile.am
===================================================================
--- trunk/myserver/include/base/home_dir/Makefile.am    2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/base/home_dir/Makefile.am    2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = home_dir.h
+include_HEADERS = home_dir.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/md5/Makefile.am
===================================================================
--- trunk/myserver/include/base/md5/Makefile.am 2008-09-01 10:08:50 UTC (rev 
2778)
+++ trunk/myserver/include/base/md5/Makefile.am 2008-09-01 19:56:39 UTC (rev 
2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = md5.h
+include_HEADERS = md5.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/mem_buff/Makefile.am
===================================================================
--- trunk/myserver/include/base/mem_buff/Makefile.am    2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/base/mem_buff/Makefile.am    2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = mem_buff.h
+include_HEADERS = mem_buff.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/multicast/Makefile.am
===================================================================
--- trunk/myserver/include/base/multicast/Makefile.am   2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/base/multicast/Makefile.am   2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = multicast.h
+include_HEADERS = multicast.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/pipe/Makefile.am
===================================================================
--- trunk/myserver/include/base/pipe/Makefile.am        2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/base/pipe/Makefile.am        2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = pipe.h
+include_HEADERS = pipe.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/process/Makefile.am
===================================================================
--- trunk/myserver/include/base/process/Makefile.am     2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/base/process/Makefile.am     2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = process.h process_server_manager.h
+include_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-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/base/regex/Makefile.am       2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = myserver_regex.h
+include_HEADERS = myserver_regex.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/safetime/Makefile.am
===================================================================
--- trunk/myserver/include/base/safetime/Makefile.am    2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/base/safetime/Makefile.am    2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = safetime.h
+include_HEADERS = safetime.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/socket/Makefile.am
===================================================================
--- trunk/myserver/include/base/socket/Makefile.am      2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/base/socket/Makefile.am      2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = socket.h ssl_socket.h
+include_HEADERS = socket.h ssl_socket.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/ssl/Makefile.am
===================================================================
--- trunk/myserver/include/base/ssl/Makefile.am 2008-09-01 10:08:50 UTC (rev 
2778)
+++ trunk/myserver/include/base/ssl/Makefile.am 2008-09-01 19:56:39 UTC (rev 
2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = ssl.h
+include_HEADERS = ssl.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/string/Makefile.am
===================================================================
--- trunk/myserver/include/base/string/Makefile.am      2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/base/string/Makefile.am      2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = securestr.h stringutils.h
+include_HEADERS = securestr.h stringutils.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/sync/Makefile.am
===================================================================
--- trunk/myserver/include/base/sync/Makefile.am        2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/base/sync/Makefile.am        2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = event.h mutex.h read_write_lock.h recursive_mutex.h semaphore.h
+include_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-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/base/thread/Makefile.am      2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = thread.h
+include_HEADERS = thread.h
 SUBDIRS =
 

Modified: trunk/myserver/include/base/xml/Makefile.am
===================================================================
--- trunk/myserver/include/base/xml/Makefile.am 2008-09-01 10:08:50 UTC (rev 
2778)
+++ trunk/myserver/include/base/xml/Makefile.am 2008-09-01 19:56:39 UTC (rev 
2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = xml_parser.h
+include_HEADERS = xml_parser.h
 SUBDIRS =
 

Modified: trunk/myserver/include/conf/Makefile.am
===================================================================
--- trunk/myserver/include/conf/Makefile.am     2008-09-01 10:08:50 UTC (rev 
2778)
+++ trunk/myserver/include/conf/Makefile.am     2008-09-01 19:56:39 UTC (rev 
2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST =
+include_HEADERS =
 SUBDIRS = mime security vhost
 

Modified: trunk/myserver/include/conf/mime/Makefile.am
===================================================================
--- trunk/myserver/include/conf/mime/Makefile.am        2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/conf/mime/Makefile.am        2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = mime_manager.h
+include_HEADERS = mime_manager.h
 SUBDIRS =
 

Modified: trunk/myserver/include/conf/security/Makefile.am
===================================================================
--- trunk/myserver/include/conf/security/Makefile.am    2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/conf/security/Makefile.am    2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = security_cache.h security.h
+include_HEADERS = security_cache.h security.h
 SUBDIRS =
 

Modified: trunk/myserver/include/conf/vhost/Makefile.am
===================================================================
--- trunk/myserver/include/conf/vhost/Makefile.am       2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/conf/vhost/Makefile.am       2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = vhost.h vhost_manager.h
+include_HEADERS = vhost.h vhost_manager.h
 SUBDIRS =
 

Modified: trunk/myserver/include/connection/Makefile.am
===================================================================
--- trunk/myserver/include/connection/Makefile.am       2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/connection/Makefile.am       2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = connection.h
+include_HEADERS = connection.h
 SUBDIRS =
 

Modified: trunk/myserver/include/connections_scheduler/Makefile.am
===================================================================
--- trunk/myserver/include/connections_scheduler/Makefile.am    2008-09-01 
10:08:50 UTC (rev 2778)
+++ trunk/myserver/include/connections_scheduler/Makefile.am    2008-09-01 
19:56:39 UTC (rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = connections_scheduler.h listen_threads.h
+include_HEADERS = connections_scheduler.h listen_threads.h
 SUBDIRS =
 

Modified: trunk/myserver/include/env/Makefile.am
===================================================================
--- trunk/myserver/include/env/Makefile.am      2008-09-01 10:08:50 UTC (rev 
2778)
+++ trunk/myserver/include/env/Makefile.am      2008-09-01 19:56:39 UTC (rev 
2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = env.h
+include_HEADERS = env.h
 SUBDIRS =
 

Modified: trunk/myserver/include/files_cache/Makefile.am
===================================================================
--- trunk/myserver/include/files_cache/Makefile.am      2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/files_cache/Makefile.am      2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = cached_file_buffer.h cached_file_factory.h cached_file.h
+include_HEADERS = cached_file_buffer.h cached_file_factory.h cached_file.h
 SUBDIRS =
 

Modified: trunk/myserver/include/filter/Makefile.am
===================================================================
--- trunk/myserver/include/filter/Makefile.am   2008-09-01 10:08:50 UTC (rev 
2778)
+++ trunk/myserver/include/filter/Makefile.am   2008-09-01 19:56:39 UTC (rev 
2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = filter.h filters_chain.h filters_factory.h memory_stream.h 
stream.h
+include_HEADERS = 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-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/filter/gzip/Makefile.am      2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = gzip_decompress.h gzip.h
+include_HEADERS = gzip_decompress.h gzip.h
 SUBDIRS =
 

Modified: trunk/myserver/include/find_data/Makefile.am
===================================================================
--- trunk/myserver/include/find_data/Makefile.am        2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/find_data/Makefile.am        2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = find_data.h
+include_HEADERS = find_data.h
 SUBDIRS =
 

Modified: trunk/myserver/include/http_handler/Makefile.am
===================================================================
--- trunk/myserver/include/http_handler/Makefile.am     2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/http_handler/Makefile.am     2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST =
+include_HEADERS =
 SUBDIRS = cgi fastcgi isapi mscgi scgi wincgi
 

Modified: trunk/myserver/include/http_handler/cgi/Makefile.am
===================================================================
--- trunk/myserver/include/http_handler/cgi/Makefile.am 2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/http_handler/cgi/Makefile.am 2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = cgi.h
+include_HEADERS = cgi.h
 SUBDIRS =
 

Modified: trunk/myserver/include/http_handler/fastcgi/Makefile.am
===================================================================
--- trunk/myserver/include/http_handler/fastcgi/Makefile.am     2008-09-01 
10:08:50 UTC (rev 2778)
+++ trunk/myserver/include/http_handler/fastcgi/Makefile.am     2008-09-01 
19:56:39 UTC (rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = fastcgi.h
+include_HEADERS = fastcgi.h
 SUBDIRS =
 

Modified: trunk/myserver/include/http_handler/isapi/Makefile.am
===================================================================
--- trunk/myserver/include/http_handler/isapi/Makefile.am       2008-09-01 
10:08:50 UTC (rev 2778)
+++ trunk/myserver/include/http_handler/isapi/Makefile.am       2008-09-01 
19:56:39 UTC (rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = isapi.h
+include_HEADERS = isapi.h
 SUBDIRS =
 

Modified: trunk/myserver/include/http_handler/mscgi/Makefile.am
===================================================================
--- trunk/myserver/include/http_handler/mscgi/Makefile.am       2008-09-01 
10:08:50 UTC (rev 2778)
+++ trunk/myserver/include/http_handler/mscgi/Makefile.am       2008-09-01 
19:56:39 UTC (rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = mscgi.h mscgi_manager.h
+include_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-01 
10:08:50 UTC (rev 2778)
+++ trunk/myserver/include/http_handler/scgi/Makefile.am        2008-09-01 
19:56:39 UTC (rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = scgi.h
+include_HEADERS = scgi.h
 SUBDIRS =
 

Modified: trunk/myserver/include/http_handler/wincgi/Makefile.am
===================================================================
--- trunk/myserver/include/http_handler/wincgi/Makefile.am      2008-09-01 
10:08:50 UTC (rev 2778)
+++ trunk/myserver/include/http_handler/wincgi/Makefile.am      2008-09-01 
19:56:39 UTC (rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = wincgi.h
+include_HEADERS = wincgi.h
 SUBDIRS =
 

Modified: trunk/myserver/include/log/Makefile.am
===================================================================
--- trunk/myserver/include/log/Makefile.am      2008-09-01 10:08:50 UTC (rev 
2778)
+++ trunk/myserver/include/log/Makefile.am      2008-09-01 19:56:39 UTC (rev 
2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = log_manager.h
+include_HEADERS = log_manager.h
 SUBDIRS =
 

Modified: trunk/myserver/include/plugin/Makefile.am
===================================================================
--- trunk/myserver/include/plugin/Makefile.am   2008-09-01 10:08:50 UTC (rev 
2778)
+++ trunk/myserver/include/plugin/Makefile.am   2008-09-01 19:56:39 UTC (rev 
2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = generic_plugins_manager.h plugin.h plugins_manager.h 
plugins_namespace.h plugins_namespace_manager.h
+include_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-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/plugin/executor/Makefile.am  2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = dynamic_executor.h dyn_executor_manager.h
+include_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-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/plugin/filter/Makefile.am    2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = dyn_filter_file.h dyn_filter.h dyn_filters_manager.h
+include_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-01 
10:08:50 UTC (rev 2778)
+++ trunk/myserver/include/plugin/http_command/Makefile.am      2008-09-01 
19:56:39 UTC (rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = dyn_http_command.h dyn_http_command_manager.h
+include_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-01 
10:08:50 UTC (rev 2778)
+++ trunk/myserver/include/plugin/http_manager/Makefile.am      2008-09-01 
19:56:39 UTC (rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = dyn_http_manager.h dyn_http_manager_list.h
+include_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-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/plugin/protocol/Makefile.am  2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = dynamic_protocol.h protocols_manager.h
+include_HEADERS = dynamic_protocol.h protocols_manager.h
 SUBDIRS =
 

Modified: trunk/myserver/include/protocol/Makefile.am
===================================================================
--- trunk/myserver/include/protocol/Makefile.am 2008-09-01 10:08:50 UTC (rev 
2778)
+++ trunk/myserver/include/protocol/Makefile.am 2008-09-01 19:56:39 UTC (rev 
2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = protocol_buffer.h protocol.h
+include_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-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/protocol/control/Makefile.am 2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = control_errors.h control_header.h control_protocol.h
+include_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-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/protocol/ftp/Makefile.am     2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = ftp_common.h ftp.h ftp_lexer.h ftp_parser.h
+include_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-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/protocol/http/Makefile.am    2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = http_data_handler.h http_data_read.h http_dir.h http_errors.h 
http_file.h http.h http_header_checker.h http_header.h http_headers.h 
http_request.h http_response.h http_thread_context.h
+include_HEADERS = http_data_handler.h http_data_read.h http_dir.h 
http_errors.h http_file.h http.h http_header_checker.h http_header.h 
http_headers.h http_request.h http_response.h http_thread_context.h
 SUBDIRS =
 

Modified: trunk/myserver/include/protocol/https/Makefile.am
===================================================================
--- trunk/myserver/include/protocol/https/Makefile.am   2008-09-01 10:08:50 UTC 
(rev 2778)
+++ trunk/myserver/include/protocol/https/Makefile.am   2008-09-01 19:56:39 UTC 
(rev 2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = https.h
+include_HEADERS = https.h
 SUBDIRS =
 

Modified: trunk/myserver/include/server/Makefile.am
===================================================================
--- trunk/myserver/include/server/Makefile.am   2008-09-01 10:08:50 UTC (rev 
2778)
+++ trunk/myserver/include/server/Makefile.am   2008-09-01 19:56:39 UTC (rev 
2779)
@@ -1,3 +1,3 @@
-EXTRA_DIST = clients_thread.h server.h
+include_HEADERS = clients_thread.h server.h
 SUBDIRS =
 

Modified: trunk/myserver/src/Makefile.am
===================================================================
--- trunk/myserver/src/Makefile.am      2008-09-01 10:08:50 UTC (rev 2778)
+++ trunk/myserver/src/Makefile.am      2008-09-01 19:56:39 UTC (rev 2779)
@@ -3,51 +3,52 @@
                                        filter find_data http_handler log 
plugin protocol server
 
 
-STATIC_AR = find_data/libfind_data.a \
-                                                                               
connection/libconnection.a env/libenv.a\
-                                                                               
log/liblog.a conf/mime/libmime.a\
-                                                                               
conf/security/libsecurity.a conf/vhost/libvhost.a\
-                                                                               
conf/libconf.a\
-                                                                               
connections_scheduler/libconnections_scheduler.a\
-                                                                               
http_handler/wincgi/libwincgi.a\
-                                                                               
http_handler/cgi/libcgi.a\
-                                                                               
http_handler/mscgi/libmscgi.a\
-                                                                               
http_handler/fastcgi/libfastcgi.a\
-                                                                               
http_handler/scgi/libscgi.a\
-                                                                               
http_handler/isapi/libisapi.a\
-                                                                               
http_handler/libhttp_handler.a base/file/libfile.a\
-                                                                               
base/pipe/libpipe.a base/base64/libbase64.a\
-                                                                               
base/mem_buff/libmem_buff.a base/libbase.a\
-                                                                               
base/home_dir/libhome_dir.a\
-                                                                               
base/multicast/libmulticast.a base/sync/libsync.a\
-                                                                               
base/safetime/libsafetime.a\
-                                                                               
base/socket/libsocket.a\
-                                                                               
base/hash_map/libhash_map.a\
-                                                                               
base/dynamic_lib/libdynamic_lib.a\
-                                                                               
base/process/libprocess.a base/md5/libmd5.a\
-                                                                               
base/ssl/libssl.a base/xml/libxml.a\
-                                                                               
base/string/libstring.a base/regex/libregex.a\
-                                                                               
base/thread/libthread.a protocol/ftp/libftp.a\
-                                                                               
protocol/control/libcontrol.a\
-                                                                               
protocol/libprotocol.a protocol/https/libhttps.a\
-                                                                               
protocol/http/libhttp.a\
-                                                                               
files_cache/libfiles_cache.a filter/gzip/libgzip.a\
-                                                                               
filter/libfilter.a plugin/executor/libexecutor.a\
-                                                                               
plugin/http_manager/libhttp_manager.a\
-                                                                               
plugin/libplugin.a plugin/protocol/libprotocol.a\
-                                                                               
plugin/filter/libfilter.a\
-                                                                               
plugin/http_command/libhttp_command.a\
-                                                                               
server/libserver.a
+# STATIC_AR = find_data/libfind_data.a \
+#                                                                              
connection/libconnection.a env/libenv.a\
+#                                                                              
log/liblog.a conf/mime/libmime.a\
+#                                                                              
conf/security/libsecurity.a conf/vhost/libvhost.a\
+#                                                                              
conf/libconf.a\
+#                                                                              
connections_scheduler/libconnections_scheduler.a\
+#                                                                              
http_handler/wincgi/libwincgi.a\
+#                                                                              
http_handler/cgi/libcgi.a\
+#                                                                              
http_handler/mscgi/libmscgi.a\
+#                                                                              
http_handler/fastcgi/libfastcgi.a\
+#                                                                              
http_handler/scgi/libscgi.a\
+#                                                                              
http_handler/isapi/libisapi.a\
+#                                                                              
http_handler/libhttp_handler.a base/file/libfile.a\
+#                                                                              
base/pipe/libpipe.a base/base64/libbase64.a\
+#                                                                              
base/mem_buff/libmem_buff.a base/libbase.a\
+#                                                                              
base/home_dir/libhome_dir.a\
+#                                                                              
base/multicast/libmulticast.a base/sync/libsync.a\
+#                                                                              
base/safetime/libsafetime.a\
+#                                                                              
base/socket/libsocket.a\
+#                                                                              
base/hash_map/libhash_map.a\
+#                                                                              
base/dynamic_lib/libdynamic_lib.a\
+#                                                                              
base/process/libprocess.a base/md5/libmd5.a\
+#                                                                              
base/ssl/libssl.a base/xml/libxml.a\
+#                                                                              
base/string/libstring.a base/regex/libregex.a\
+#                                                                              
base/thread/libthread.a protocol/ftp/libftp.a\
+#                                                                              
protocol/control/libcontrol.a\
+#                                                                              
protocol/libprotocol.a protocol/https/libhttps.a\
+#                                                                              
protocol/http/libhttp.a\
+#                                                                              
files_cache/libfiles_cache.a filter/gzip/libgzip.a\
+#                                                                              
filter/libfilter.a plugin/executor/libexecutor.a\
+#                                                                              
plugin/http_manager/libhttp_manager.a\
+#                                                                              
plugin/libplugin.a plugin/protocol/libprotocol.a\
+#                                                                              
plugin/filter/libfilter.a\
+#                                                                              
plugin/http_command/libhttp_command.a\
+#                                                                              
server/libserver.a
 
+build_subdirs:
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) all) \
+       done;
+
 libmyserver.a: build_subdirs
        rm -f libmyserver.a
        find -iregex .*\\.o | xargs ar cru libmyserver.a
        ranlib libmyserver.a
 
-#lib_LIBRARIES = libmyserver.a
-#libmyserver_a_SOURCES = 
-#libmyserver_a_LIBADD = $(STATIC_AR)
-
 bin_PROGRAMS = myserver
 myserver_SOURCES = myserver.cpp
 
@@ -59,11 +60,6 @@
 
 myserver_DEPENDENCIES = libmyserver.a
 
-build_subdirs:
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) all) \
-       done;
-
 myserver_CXXFLAGS = $(CXXFLAGS) $(XML_CFLAGS) -DHOST_STR=\"$(build)\" 
-DPREFIX=\"$(prefix)\"
 myserver_LDFLAGS =  -rdynamic libmyserver.a
 






reply via email to

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