myserver-commit
[Top][All Lists]
Advanced

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

[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-214-


From: Giuseppe Scrivano
Subject: [myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-214-gcc03a9a
Date: Wed, 05 May 2010 14:48:33 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  cc03a9a19ea4106513dfea5f3a3ba6d54df3507c (commit)
      from  efe7a52e763071a82331f75012df4883c789c82d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit cc03a9a19ea4106513dfea5f3a3ba6d54df3507c
Author: Giuseppe Scrivano <address@hidden>
Date:   Wed May 5 11:41:55 2010 +0200

    Fix VPATH builds

diff --git a/myserver/Makefile.am b/myserver/Makefile.am
index c6bceb2..76dfc38 100644
--- a/myserver/Makefile.am
+++ b/myserver/Makefile.am
@@ -22,9 +22,11 @@ if BUILD_DOC
 DOCS = documentation
 endif
 
-SUBDIRS = lib po src include $(CONTROL) binaries $(DOCS) $(TESTS_DIR)
+SUBDIRS = lib po include src $(CONTROL) binaries $(DOCS) $(TESTS_DIR)
 
-EXTRA_DIST = myserver.h doxygen SConstruct
+include_HEADERS = myserver.h
+
+EXTRA_DIST = doxygen SConstruct
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -32,6 +34,9 @@ localedir.h: Makefile
        echo '/* This file is auto-generated by Makefile!  */' >$@
        echo '#define LOCALEDIR "$(localedir)"' >> $@
 
+clean-generic:
+       rm -f localedir.h
+
 all: localedir.h
 # Generate the localedir.h file before any other rule.
 
diff --git a/myserver/binaries/Makefile.am b/myserver/binaries/Makefile.am
index 3731bfc..1f1806e 100644
--- a/myserver/binaries/Makefile.am
+++ b/myserver/binaries/Makefile.am
@@ -20,8 +20,3 @@ EXTRA_DIST = myserver-daemon MIMEtypes.default.xml 
myserver.default.xml \
                                                 virtualhosts.default.xml
 
 configdir = $(DESTDIR)$(prefix)/etc/myserver
-
-install: install-recursive
-       $(install_sh_DATA) MIMEtypes.default.xml 
$(configdir)/MIMEtypes.default.xml
-       $(install_sh_DATA) myserver.default.xml 
$(configdir)/myserver.default.xml
-       $(install_sh_DATA) virtualhosts.default.xml 
$(configdir)/virtualhosts.default.xml
diff --git a/myserver/binaries/certificates/Makefile.am 
b/myserver/binaries/certificates/Makefile.am
index 87b3c40..4d098ce 100644
--- a/myserver/binaries/certificates/Makefile.am
+++ b/myserver/binaries/certificates/Makefile.am
@@ -17,4 +17,4 @@
 EXTRA_DIST = how_create_certificates.txt
 install :
        $(INSTALL) -d '$(DESTDIR)$(prefix)/etc/myserver/certificates'
-       $(INSTALL) 'how_create_certificates.txt' 
'$(DESTDIR)$(prefix)/etc/myserver/certificates/how_create_certificates.txt'
+
diff --git a/myserver/binaries/web/cgi-src/math_sum/Makefile.am 
b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
index 21ce31b..7e3e59b 100644
--- a/myserver/binaries/web/cgi-src/math_sum/Makefile.am
+++ b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # Makefile for math_sum
 
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libmath_sum.la
 libmath_sum_la_SOURCES = math_sum.cpp
 libmath_sum_la_LDFLAGS = -shared -export-dynamic -no-install -no-undefined 
-module \
@@ -29,4 +29,7 @@ math_sum.mscgi: libmath_sum.la
        test \! -e .libs/libmath_sum.mscgi \
                || cp .libs/libmath_sum.mscgi ../../cgi-bin/math_sum.mscgi
 
+clean-generic:
+       rm -f  ../../cgi-bin/math_sum.mscgi
+
 .phony : math_sum.mscgi
diff --git a/myserver/binaries/web/cgi-src/post/Makefile.am 
b/myserver/binaries/web/cgi-src/post/Makefile.am
index 4ac532f..c0b586f 100644
--- a/myserver/binaries/web/cgi-src/post/Makefile.am
+++ b/myserver/binaries/web/cgi-src/post/Makefile.am
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # Makefile for post
 
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libpost.la
 libpost_la_SOURCES = post.cpp
 libpost_la_LDFLAGS = -shared -export-dynamic -no-install -no-undefined -module 
\
@@ -29,4 +29,7 @@ post.mscgi: libpost.la
        test \! -e .libs/libpost.mscgi \
                || cp .libs/libpost.mscgi ../../cgi-bin/post.mscgi
 
+clean-generic:
+       rm -f  ../../cgi-bin/post.mscgi
+
 .phony : post.mscgi
diff --git a/myserver/documentation/Makefile.am 
b/myserver/documentation/Makefile.am
index 9ea6347..8081b1a 100644
--- a/myserver/documentation/Makefile.am
+++ b/myserver/documentation/Makefile.am
@@ -17,6 +17,13 @@
 info_TEXINFOS=myserver.texi
 
 #any other .texi that is not myserver.texi
-myserver_TEXINFOS=basic_configuration.texi directory_listing.texi 
doclicense.texi error_pages.texi mime_types.texi process_security.texi 
virtual_hosts.texi ssl_certificates.texi
-
-SUBDIRS = 
+myserver_TEXINFOS = basic_configuration.texi \
+                   directory_listing.texi \
+                   doclicense.texi \
+                   error_pages.texi \
+                   log_management.texi \
+                   mime_types.texi \
+                   process_security.texi \
+                   security.texi \
+                   ssl_certificates.texi \
+                   virtual_hosts.texi
diff --git a/myserver/include/Makefile.am b/myserver/include/Makefile.am
index 08f0fc5..e13daeb 100644
--- a/myserver/include/Makefile.am
+++ b/myserver/include/Makefile.am
@@ -14,9 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-includeincludedir=$(includedir)/myserver/include/find_data
-includeinclude_HEADERS =
-SUBDIRS = base conf connection connections_scheduler filter http_handler log 
plugin protocol server
 
-install:
-# Do not do anything.
+SUBDIRS = base conf connection connections_scheduler filter http_handler \
+         log plugin protocol server
diff --git a/myserver/include/base/Makefile.am 
b/myserver/include/base/Makefile.am
index 97cbc85..0292466 100644
--- a/myserver/include/base/Makefile.am
+++ b/myserver/include/base/Makefile.am
@@ -14,8 +14,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-baseincludedir=$(includedir)/myserver/include/base
-baseinclude_HEADERS = utility.h
+
address@hidden@/myserver/include/base
+include_HEADERS = utility.h
+
 SUBDIRS = base64 bitvec crypt dynamic_lib file files_cache read_directory \
-                                       hash_map home_dir mem_buff multicast 
pipe process regex safetime \
-                                       slab socket socket_pair ssl string sync 
thread unix_socket xml exceptions
+       hash_map home_dir mem_buff multicast pipe process regex safetime \
+       slab socket socket_pair ssl string sync thread unix_socket xml \
+       exceptions
diff --git a/myserver/include/base/base64/Makefile.am 
b/myserver/include/base/base64/Makefile.am
index d944e98..fd19040 100644
--- a/myserver/include/base/base64/Makefile.am
+++ b/myserver/include/base/base64/Makefile.am
@@ -14,7 +14,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-base64includedir=$(includedir)/myserver/include/base/base64
-base64include_HEADERS = mime_utils.h
+
address@hidden@/myserver/include/base/base64
+include_HEADERS = mime_utils.h
 SUBDIRS =
 
diff --git a/myserver/include/base/bitvec/Makefile.am 
b/myserver/include/base/bitvec/Makefile.am
index 5812a7c..d720c1e 100644
--- a/myserver/include/base/bitvec/Makefile.am
+++ b/myserver/include/base/bitvec/Makefile.am
@@ -14,6 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-bitvecincludedir=$(includedir)/myserver/include/base/bitvec
-bitvecinclude_HEADERS = bitvec.h
address@hidden@/myserver/include/base/bitvec
+include_HEADERS = bitvec.h
 SUBDIRS =
diff --git a/myserver/include/base/crypt/Makefile.am 
b/myserver/include/base/crypt/Makefile.am
index 2b411e4..b727469 100644
--- a/myserver/include/base/crypt/Makefile.am
+++ b/myserver/include/base/crypt/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-cryptincludedir=$(includedir)/myserver/include/base/crypt
-cryptinclude_HEADERS = crypt_algo.h crypt_algo_manager.h md5.h sha1.h
address@hidden@/myserver/include/base/crypt
+include_HEADERS = crypt_algo.h crypt_algo_manager.h md5.h sha1.h
 SUBDIRS =
 
diff --git a/myserver/include/base/dynamic_lib/Makefile.am 
b/myserver/include/base/dynamic_lib/Makefile.am
index 6d64922..4a7e919 100644
--- a/myserver/include/base/dynamic_lib/Makefile.am
+++ b/myserver/include/base/dynamic_lib/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dynamic_libincludedir=$(includedir)/myserver/include/base/dynamic_lib
-dynamic_libinclude_HEADERS = dynamiclib.h
address@hidden@/myserver/include/base/dynamic_lib
+include_HEADERS = dynamiclib.h
 SUBDIRS =
 
diff --git a/myserver/include/base/exceptions/Makefile.am 
b/myserver/include/base/exceptions/Makefile.am
index 4356022..a84695d 100644
--- a/myserver/include/base/exceptions/Makefile.am
+++ b/myserver/include/base/exceptions/Makefile.am
@@ -1,3 +1,3 @@
-exceptionsincludedir=$(includedir)/myserver/include/base/exceptions
-exceptionsinclude_HEADERS = checked.h exceptions.h
address@hidden@/myserver/include/base/exceptions
+include_HEADERS = checked.h exceptions.h
 SUBDIRS =
diff --git a/myserver/include/base/file/Makefile.am 
b/myserver/include/base/file/Makefile.am
index ba770b2..c5809c1 100644
--- a/myserver/include/base/file/Makefile.am
+++ b/myserver/include/base/file/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-fileincludedir=$(includedir)/myserver/include/base/file
-fileinclude_HEADERS = file.h files_utility.h
address@hidden@/myserver/include/base/file
+include_HEADERS = file.h files_utility.h
 SUBDIRS =
 
diff --git a/myserver/include/base/files_cache/Makefile.am 
b/myserver/include/base/files_cache/Makefile.am
index 9503f3b..f542cd5 100644
--- a/myserver/include/base/files_cache/Makefile.am
+++ b/myserver/include/base/files_cache/Makefile.am
@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-files_cacheincludedir=$(includedir)/myserver/include/base/files_cache
-files_cacheinclude_HEADERS = cached_file_buffer.h cached_file_factory.h \
address@hidden@/myserver/include/base/files_cache
+include_HEADERS = cached_file_buffer.h cached_file_factory.h \
                             cached_file.h membuf_file.h
 SUBDIRS =
 
diff --git a/myserver/include/base/hash_map/Makefile.am 
b/myserver/include/base/hash_map/Makefile.am
index 7d37950..1869fda 100644
--- a/myserver/include/base/hash_map/Makefile.am
+++ b/myserver/include/base/hash_map/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-hash_mapincludedir=$(includedir)/myserver/include/base/hash_map
-hash_mapinclude_HEADERS = hash_map.h
address@hidden@/myserver/include/base/hash_map
+include_HEADERS = hash_map.h
 SUBDIRS =
 
diff --git a/myserver/include/base/home_dir/Makefile.am 
b/myserver/include/base/home_dir/Makefile.am
index 21f15c4..18f88e6 100644
--- a/myserver/include/base/home_dir/Makefile.am
+++ b/myserver/include/base/home_dir/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-home_dirincludedir=$(includedir)/myserver/include/base/home_dir
-home_dirinclude_HEADERS = home_dir.h
address@hidden@/myserver/include/base/home_dir
+include_HEADERS = home_dir.h
 SUBDIRS =
 
diff --git a/myserver/include/base/mem_buff/Makefile.am 
b/myserver/include/base/mem_buff/Makefile.am
index 231dea1..8b3c2dc 100644
--- a/myserver/include/base/mem_buff/Makefile.am
+++ b/myserver/include/base/mem_buff/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-mem_buffincludedir=$(includedir)/myserver/include/base/mem_buff
-mem_buffinclude_HEADERS = mem_buff.h
address@hidden@/myserver/include/base/mem_buff
+include_HEADERS = mem_buff.h
 SUBDIRS =
 
diff --git a/myserver/include/base/multicast/Makefile.am 
b/myserver/include/base/multicast/Makefile.am
index 0d26afd..eee7cd3 100644
--- a/myserver/include/base/multicast/Makefile.am
+++ b/myserver/include/base/multicast/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-multicastincludedir=$(includedir)/myserver/include/base/multicast
-multicastinclude_HEADERS = multicast.h
address@hidden@/myserver/include/base/multicast
+include_HEADERS = multicast.h
 SUBDIRS =
 
diff --git a/myserver/include/base/pipe/Makefile.am 
b/myserver/include/base/pipe/Makefile.am
index be8863e..ca8f67d 100644
--- a/myserver/include/base/pipe/Makefile.am
+++ b/myserver/include/base/pipe/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-pipeincludedir=$(includedir)/myserver/include/base/pipe
-pipeinclude_HEADERS = pipe.h
address@hidden@/myserver/include/base/pipe
+include_HEADERS = pipe.h
 SUBDIRS =
 
diff --git a/myserver/include/base/process/Makefile.am 
b/myserver/include/base/process/Makefile.am
index e08800c..82eff45 100644
--- a/myserver/include/base/process/Makefile.am
+++ b/myserver/include/base/process/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-processincludedir=$(includedir)/myserver/include/base/process
-processinclude_HEADERS = fork_server.h process.h process_server_manager.h
address@hidden@/myserver/include/base/process
+include_HEADERS = fork_server.h process.h process_server_manager.h
 SUBDIRS =
 
diff --git a/myserver/include/base/read_directory/Makefile.am 
b/myserver/include/base/read_directory/Makefile.am
index 417e144..9b25503 100644
--- a/myserver/include/base/read_directory/Makefile.am
+++ b/myserver/include/base/read_directory/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-read_directoryincludedir=$(includedir)/myserver/include/base/read_directory
-read_directoryinclude_HEADERS = read_directory.h
address@hidden@/myserver/include/base/read_directory
+include_HEADERS = read_directory.h
 SUBDIRS =
 
diff --git a/myserver/include/base/regex/Makefile.am 
b/myserver/include/base/regex/Makefile.am
index 9ec743a..17769ac 100644
--- a/myserver/include/base/regex/Makefile.am
+++ b/myserver/include/base/regex/Makefile.am
@@ -14,6 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-regexincludedir=$(includedir)/myserver/include/base/regex
-regexinclude_HEADERS = myserver_regex.h
address@hidden@/myserver/include/base/regex
+include_HEADERS = myserver_regex.h
 SUBDIRS =
diff --git a/myserver/include/base/safetime/Makefile.am 
b/myserver/include/base/safetime/Makefile.am
index cb5801e..7f579af 100644
--- a/myserver/include/base/safetime/Makefile.am
+++ b/myserver/include/base/safetime/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-safetimeincludedir=$(includedir)/myserver/include/base/safetime
-safetimeinclude_HEADERS = safetime.h
address@hidden@/myserver/include/base/safetime
+include_HEADERS = safetime.h
 SUBDIRS =
 
diff --git a/myserver/include/base/slab/Makefile.am 
b/myserver/include/base/slab/Makefile.am
index d359cdc..9dc5694 100644
--- a/myserver/include/base/slab/Makefile.am
+++ b/myserver/include/base/slab/Makefile.am
@@ -14,6 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-slabincludedir=$(includedir)/myserver/include/base/slab
-slabinclude_HEADERS = slab.h
address@hidden@/myserver/include/base/slab
+include_HEADERS = slab.h
 SUBDIRS =
diff --git a/myserver/include/base/socket/Makefile.am 
b/myserver/include/base/socket/Makefile.am
index 19867b8..a4a592e 100644
--- a/myserver/include/base/socket/Makefile.am
+++ b/myserver/include/base/socket/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-socketincludedir=$(includedir)/myserver/include/base/socket
-socketinclude_HEADERS = socket.h ssl_socket.h
address@hidden@/myserver/include/base/socket
+include_HEADERS = socket.h ssl_socket.h
 SUBDIRS =
 
diff --git a/myserver/include/base/socket_pair/Makefile.am 
b/myserver/include/base/socket_pair/Makefile.am
index e17132a..7da677e 100644
--- a/myserver/include/base/socket_pair/Makefile.am
+++ b/myserver/include/base/socket_pair/Makefile.am
@@ -14,6 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-socket_pair_includedir=$(includedir)/myserver/include/base/socket_pair
-socket_pair_include_HEADERS = socket_pair.h
address@hidden@/myserver/include/base/socket_pair
+include_HEADERS = socket_pair.h
 SUBDIRS =
diff --git a/myserver/include/base/ssl/Makefile.am 
b/myserver/include/base/ssl/Makefile.am
index 48b4e09..663895e 100644
--- a/myserver/include/base/ssl/Makefile.am
+++ b/myserver/include/base/ssl/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-sslincludedir=$(includedir)/myserver/include/base/ssl
-sslinclude_HEADERS = ssl.h
address@hidden@/myserver/include/base/ssl
+include_HEADERS = ssl.h
 SUBDIRS =
 
diff --git a/myserver/include/base/string/Makefile.am 
b/myserver/include/base/string/Makefile.am
index 34db319..0cca370 100644
--- a/myserver/include/base/string/Makefile.am
+++ b/myserver/include/base/string/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-stringincludedir=$(includedir)/myserver/include/base/string
-stringinclude_HEADERS = securestr.h stringutils.h
address@hidden@/myserver/include/base/string
+include_HEADERS = securestr.h stringutils.h
 SUBDIRS =
 
diff --git a/myserver/include/base/sync/Makefile.am 
b/myserver/include/base/sync/Makefile.am
index 50a3b09..d6f245a 100644
--- a/myserver/include/base/sync/Makefile.am
+++ b/myserver/include/base/sync/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-syncincludedir=$(includedir)/myserver/include/base/sync
-syncinclude_HEADERS = event.h mutex.h read_write_lock.h recursive_mutex.h 
semaphore.h
address@hidden@/myserver/include/base/sync
+include_HEADERS = event.h mutex.h read_write_lock.h recursive_mutex.h 
semaphore.h
 SUBDIRS =
 
diff --git a/myserver/include/base/thread/Makefile.am 
b/myserver/include/base/thread/Makefile.am
index cfc5b82..87644dd 100644
--- a/myserver/include/base/thread/Makefile.am
+++ b/myserver/include/base/thread/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-threadincludedir=$(includedir)/myserver/include/base/thread
-threadinclude_HEADERS = thread.h
address@hidden@/myserver/include/base/thread
+include_HEADERS = thread.h
 SUBDIRS =
 
diff --git a/myserver/include/base/unix_socket/Makefile.am 
b/myserver/include/base/unix_socket/Makefile.am
index 28bae49..993c848 100644
--- a/myserver/include/base/unix_socket/Makefile.am
+++ b/myserver/include/base/unix_socket/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-unix_socketincludedir=$(includedir)/myserver/include/base/unix_socket
-unix_socketinclude_HEADERS = unix_socket.h
address@hidden@/myserver/include/base/unix_socket
+include_HEADERS = unix_socket.h
 SUBDIRS =
 
diff --git a/myserver/include/base/xml/Makefile.am 
b/myserver/include/base/xml/Makefile.am
index 10b9688..40d09e0 100644
--- a/myserver/include/base/xml/Makefile.am
+++ b/myserver/include/base/xml/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-xmlincludedir=$(includedir)/myserver/include/base/xml
-xmlinclude_HEADERS = xml_parser.h
address@hidden@/myserver/include/base/xml
+include_HEADERS = xml_parser.h
 SUBDIRS =
 
diff --git a/myserver/include/conf/Makefile.am 
b/myserver/include/conf/Makefile.am
index 9a5d6c3..5838b3e 100644
--- a/myserver/include/conf/Makefile.am
+++ b/myserver/include/conf/Makefile.am
@@ -14,6 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-confincludedir=$(includedir)/myserver/include/conf
-confinclude_HEADERS = nodetree.h xml_conf.h
address@hidden@/myserver/include/conf
+include_HEADERS = nodetree.h xml_conf.h
 SUBDIRS = main mime security vhost
diff --git a/myserver/include/conf/main/Makefile.am 
b/myserver/include/conf/main/Makefile.am
index 875a6c1..b98a08a 100644
--- a/myserver/include/conf/main/Makefile.am
+++ b/myserver/include/conf/main/Makefile.am
@@ -14,6 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-mainincludedir=$(includedir)/myserver/include/conf/main
-maininclude_HEADERS = main_configuration.h xml_main_configuration.h
address@hidden@/myserver/include/conf/main
+include_HEADERS = main_configuration.h xml_main_configuration.h
 SUBDIRS =
diff --git a/myserver/include/conf/mime/Makefile.am 
b/myserver/include/conf/mime/Makefile.am
index fe3785c..7b6e31c 100644
--- a/myserver/include/conf/mime/Makefile.am
+++ b/myserver/include/conf/mime/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-mimeincludedir=$(includedir)/myserver/include/conf/mime
-mimeinclude_HEADERS = mime_manager.h xml_mime_handler.h
address@hidden@/myserver/include/conf/mime
+include_HEADERS = mime_manager.h xml_mime_handler.h
 SUBDIRS =
 
diff --git a/myserver/include/conf/security/Makefile.am 
b/myserver/include/conf/security/Makefile.am
index 6145adf..7ea5237 100644
--- a/myserver/include/conf/security/Makefile.am
+++ b/myserver/include/conf/security/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-securityincludedir=$(includedir)/myserver/include/conf/security
-securityinclude_HEADERS = auth_domain.h auth_method.h auth_method_factory.h 
security_cache.h security_domain.h security_manager.h security_token.h 
validator.h validator_factory.h xml_validator.h
address@hidden@/myserver/include/conf/security
+include_HEADERS = auth_domain.h auth_method.h auth_method_factory.h 
security_cache.h security_domain.h security_manager.h security_token.h 
validator.h validator_factory.h xml_validator.h
 SUBDIRS =
 
diff --git a/myserver/include/conf/vhost/Makefile.am 
b/myserver/include/conf/vhost/Makefile.am
index b33541e..1ae4502 100644
--- a/myserver/include/conf/vhost/Makefile.am
+++ b/myserver/include/conf/vhost/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-vhostincludedir=$(includedir)/myserver/include/conf/vhost
-vhostinclude_HEADERS = vhost.h vhost_manager.h ip.h xml_vhost_handler.h
address@hidden@/myserver/include/conf/vhost
+include_HEADERS = vhost.h vhost_manager.h ip.h xml_vhost_handler.h
 SUBDIRS =
 
diff --git a/myserver/include/connection/Makefile.am 
b/myserver/include/connection/Makefile.am
index 0e48458..64c625a 100644
--- a/myserver/include/connection/Makefile.am
+++ b/myserver/include/connection/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-connectionincludedir=$(includedir)/myserver/include/connection
-connectioninclude_HEADERS = connection.h
address@hidden@/myserver/include/connection
+include_HEADERS = connection.h
 SUBDIRS =
 
diff --git a/myserver/include/connections_scheduler/Makefile.am 
b/myserver/include/connections_scheduler/Makefile.am
index 500506e..348c17b 100644
--- a/myserver/include/connections_scheduler/Makefile.am
+++ b/myserver/include/connections_scheduler/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-connections_schedulerincludedir=$(includedir)/myserver/include/connections_scheduler
-connections_schedulerinclude_HEADERS = connections_scheduler.h listen_threads.h
address@hidden@/myserver/include/connections_scheduler
+include_HEADERS = connections_scheduler.h listen_threads.h
 SUBDIRS =
 
diff --git a/myserver/include/filter/Makefile.am 
b/myserver/include/filter/Makefile.am
index 998fe83..54e0630 100644
--- a/myserver/include/filter/Makefile.am
+++ b/myserver/include/filter/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-filterincludedir=$(includedir)/myserver/include/filter
-filterinclude_HEADERS = console.h filter.h filters_chain.h filters_factory.h 
memory_stream.h stream.h
address@hidden@/myserver/include/filter
+include_HEADERS = console.h filter.h filters_chain.h filters_factory.h 
memory_stream.h stream.h
 SUBDIRS = gzip
 
diff --git a/myserver/include/filter/gzip/Makefile.am 
b/myserver/include/filter/gzip/Makefile.am
index bbfffee..482be95 100644
--- a/myserver/include/filter/gzip/Makefile.am
+++ b/myserver/include/filter/gzip/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-gzipincludedir=$(includedir)/myserver/include/filter/gzip
-gzipinclude_HEADERS = gzip_decompress.h gzip.h
address@hidden@/myserver/include/filter/gzip
+include_HEADERS = gzip_decompress.h gzip.h
 SUBDIRS =
 
diff --git a/myserver/include/http_handler/Makefile.am 
b/myserver/include/http_handler/Makefile.am
index bdc72fe..8862c14 100644
--- a/myserver/include/http_handler/Makefile.am
+++ b/myserver/include/http_handler/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-http_handlerincludedir=$(includedir)/myserver/include/http_handler
-http_handlerinclude_HEADERS =
address@hidden@/myserver/include/http_handler
+include_HEADERS =
 SUBDIRS = cgi fastcgi http_dir http_file isapi mscgi proxy scgi wincgi
 
diff --git a/myserver/include/http_handler/cgi/Makefile.am 
b/myserver/include/http_handler/cgi/Makefile.am
index c62e855..533d230 100644
--- a/myserver/include/http_handler/cgi/Makefile.am
+++ b/myserver/include/http_handler/cgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-cgiincludedir=$(includedir)/myserver/include/http_handler/cgi
-cgiinclude_HEADERS = cgi.h
address@hidden@/myserver/include/http_handler/cgi
+include_HEADERS = cgi.h
 SUBDIRS =
 
diff --git a/myserver/include/http_handler/fastcgi/Makefile.am 
b/myserver/include/http_handler/fastcgi/Makefile.am
index 9348b3b..23e1095 100644
--- a/myserver/include/http_handler/fastcgi/Makefile.am
+++ b/myserver/include/http_handler/fastcgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-fastcgiincludedir=$(includedir)/myserver/include/http_handler/fastcgi
-fastcgiinclude_HEADERS = fastcgi.h
address@hidden@/myserver/include/http_handler/fastcgi
+include_HEADERS = fastcgi.h
 SUBDIRS =
 
diff --git a/myserver/include/http_handler/http_dir/Makefile.am 
b/myserver/include/http_handler/http_dir/Makefile.am
index 9ba9eb3..9e39da5 100644
--- a/myserver/include/http_handler/http_dir/Makefile.am
+++ b/myserver/include/http_handler/http_dir/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-http_dirincludedir=$(includedir)/myserver/include/http_handler/http_dir
-http_dirinclude_HEADERS = http_dir.h
address@hidden@/myserver/include/http_handler/http_dir
+include_HEADERS = http_dir.h
 SUBDIRS =
 
diff --git a/myserver/include/http_handler/http_file/Makefile.am 
b/myserver/include/http_handler/http_file/Makefile.am
index 3428931..af8bb5a 100644
--- a/myserver/include/http_handler/http_file/Makefile.am
+++ b/myserver/include/http_handler/http_file/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-http_fileincludedir=$(includedir)/myserver/include/http_handler/http_file
-http_fileinclude_HEADERS = http_file.h
address@hidden@/myserver/include/http_handler/http_file
+include_HEADERS = http_file.h
 SUBDIRS =
 
diff --git a/myserver/include/http_handler/isapi/Makefile.am 
b/myserver/include/http_handler/isapi/Makefile.am
index 88ef50e..770c03d 100644
--- a/myserver/include/http_handler/isapi/Makefile.am
+++ b/myserver/include/http_handler/isapi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-isapiincludedir=$(includedir)/myserver/include/http_handler/isapi
-isapiinclude_HEADERS = isapi.h
address@hidden@/myserver/include/http_handler/isapi
+include_HEADERS = isapi.h
 SUBDIRS =
 
diff --git a/myserver/include/http_handler/mscgi/Makefile.am 
b/myserver/include/http_handler/mscgi/Makefile.am
index 47cbe11..1cd8008 100644
--- a/myserver/include/http_handler/mscgi/Makefile.am
+++ b/myserver/include/http_handler/mscgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-mscgiincludedir=$(includedir)/myserver/include/http_handler/mscgi
-mscgiinclude_HEADERS = mscgi.h mscgi_manager.h
address@hidden@/myserver/include/http_handler/mscgi
+include_HEADERS = mscgi.h mscgi_manager.h
 SUBDIRS =
 
diff --git a/myserver/include/http_handler/proxy/Makefile.am 
b/myserver/include/http_handler/proxy/Makefile.am
index ce99393..bedb399 100644
--- a/myserver/include/http_handler/proxy/Makefile.am
+++ b/myserver/include/http_handler/proxy/Makefile.am
@@ -14,6 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-proxyincludedir=$(includedir)/myserver/include/http_handler/proxy
-proxyinclude_HEADERS = proxy.h
address@hidden@/myserver/include/http_handler/proxy
+include_HEADERS = proxy.h
 SUBDIRS =
diff --git a/myserver/include/http_handler/scgi/Makefile.am 
b/myserver/include/http_handler/scgi/Makefile.am
index cf232ba..e16a561 100644
--- a/myserver/include/http_handler/scgi/Makefile.am
+++ b/myserver/include/http_handler/scgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-scgiincludedir=$(includedir)/myserver/include/http_handler/scgi
-scgiinclude_HEADERS = scgi.h
address@hidden@/myserver/include/http_handler/scgi
+include_HEADERS = scgi.h
 SUBDIRS =
 
diff --git a/myserver/include/http_handler/wincgi/Makefile.am 
b/myserver/include/http_handler/wincgi/Makefile.am
index f5810be..c1581c6 100644
--- a/myserver/include/http_handler/wincgi/Makefile.am
+++ b/myserver/include/http_handler/wincgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-wincgiincludedir=$(includedir)/myserver/include/http_handler/wincgi
-wincgiinclude_HEADERS = wincgi.h
address@hidden@/myserver/include/http_handler/wincgi
+include_HEADERS = wincgi.h
 SUBDIRS =
 
diff --git a/myserver/include/log/Makefile.am b/myserver/include/log/Makefile.am
index 5bdf3c9..62fc1e5 100644
--- a/myserver/include/log/Makefile.am
+++ b/myserver/include/log/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-logincludedir=$(includedir)/myserver/include/log
-loginclude_HEADERS = log_manager.h
address@hidden@/myserver/include/log
+include_HEADERS = log_manager.h
 SUBDIRS = stream
 
diff --git a/myserver/include/log/stream/Makefile.am 
b/myserver/include/log/stream/Makefile.am
index 8b98150..4e9f5f1 100644
--- a/myserver/include/log/stream/Makefile.am
+++ b/myserver/include/log/stream/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-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
address@hidden@/myserver/include/log/stream
+include_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 =
 
diff --git a/myserver/include/plugin/Makefile.am 
b/myserver/include/plugin/Makefile.am
index 74f2c1a..5f80b21 100644
--- a/myserver/include/plugin/Makefile.am
+++ b/myserver/include/plugin/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-pluginincludedir=$(includedir)/myserver/include/plugin
-plugininclude_HEADERS =  plugin.h plugin_info.h plugins_manager.h 
address@hidden@/myserver/include/plugin
+include_HEADERS =  plugin.h plugin_info.h plugins_manager.h 
 
 
diff --git a/myserver/include/protocol/Makefile.am 
b/myserver/include/protocol/Makefile.am
index 6d7f3b4..20a1db8 100644
--- a/myserver/include/protocol/Makefile.am
+++ b/myserver/include/protocol/Makefile.am
@@ -14,6 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-protocolincludedir=$(includedir)/myserver/include/protocol
-protocolinclude_HEADERS = protocol_buffer.h protocol.h protocols_manager.h 
url.h
address@hidden@/myserver/include/protocol
+include_HEADERS = protocol_buffer.h protocol.h protocols_manager.h url.h
 SUBDIRS = control ftp gopher http https
diff --git a/myserver/include/protocol/control/Makefile.am 
b/myserver/include/protocol/control/Makefile.am
index 55c6398..f0253c1 100644
--- a/myserver/include/protocol/control/Makefile.am
+++ b/myserver/include/protocol/control/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-controlincludedir=$(includedir)/myserver/include/protocol/control
-controlinclude_HEADERS = control_errors.h control_header.h control_protocol.h
address@hidden@/myserver/include/protocol/control
+include_HEADERS = control_errors.h control_header.h control_protocol.h
 SUBDIRS =
 
diff --git a/myserver/include/protocol/ftp/Makefile.am 
b/myserver/include/protocol/ftp/Makefile.am
index a964394..2c60fc8 100644
--- a/myserver/include/protocol/ftp/Makefile.am
+++ b/myserver/include/protocol/ftp/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-ftpincludedir=$(includedir)/myserver/include/protocol/ftp
-ftpinclude_HEADERS = ftp_common.h ftp.h ftp_lexer.h ftp_parser.h
address@hidden@/myserver/include/protocol/ftp
+include_HEADERS = ftp_common.h ftp.h ftp_lexer.h ftp_parser.h
 SUBDIRS =
 
diff --git a/myserver/include/protocol/gopher/Makefile.am 
b/myserver/include/protocol/gopher/Makefile.am
index bc05d22..fee75ba 100644
--- a/myserver/include/protocol/gopher/Makefile.am
+++ b/myserver/include/protocol/gopher/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-gopherincludedir=$(includedir)/myserver/include/protocol/gopher
-gopherinclude_HEADERS = gopher.h gopher_content.h engine.h
address@hidden@/myserver/include/protocol/gopher
+include_HEADERS = gopher.h gopher_content.h engine.h
 
 
diff --git a/myserver/include/protocol/http/Makefile.am 
b/myserver/include/protocol/http/Makefile.am
index d716710..e1104fa 100644
--- a/myserver/include/protocol/http/Makefile.am
+++ b/myserver/include/protocol/http/Makefile.am
@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-httpincludedir=$(includedir)/myserver/include/protocol/http
-httpinclude_HEADERS = dyn_http_command.h dyn_http_command_manager.h \
address@hidden@/myserver/include/protocol/http
+include_HEADERS = dyn_http_command.h dyn_http_command_manager.h \
        dyn_http_manager.h dyn_http_manager_list.h http_data_handler.h \
        http_data_read.h http_errors.h http.h http_header.h http_headers.h \
        http_internal_exception.h http_request.h http_req_security_domain.h     
\
diff --git a/myserver/include/protocol/http/env/Makefile.am 
b/myserver/include/protocol/http/env/Makefile.am
index 4b277d6..ad5be02 100644
--- a/myserver/include/protocol/http/env/Makefile.am
+++ b/myserver/include/protocol/http/env/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-envincludedir=$(includedir)/myserver/include/protocol/http/env
-envinclude_HEADERS = env.h
address@hidden@/myserver/include/protocol/http/env
+include_HEADERS = env.h
 SUBDIRS =
 
diff --git a/myserver/include/protocol/https/Makefile.am 
b/myserver/include/protocol/https/Makefile.am
index eb4111e..90f5f2f 100644
--- a/myserver/include/protocol/https/Makefile.am
+++ b/myserver/include/protocol/https/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-httpsincludedir=$(includedir)/myserver/include/protocol/https
-httpsinclude_HEADERS = https.h
address@hidden@/myserver/include/protocol/https
+include_HEADERS = https.h
 SUBDIRS =
 
diff --git a/myserver/include/server/Makefile.am 
b/myserver/include/server/Makefile.am
index 19cb42d..4e1eb5e 100644
--- a/myserver/include/server/Makefile.am
+++ b/myserver/include/server/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-serverincludedir=$(includedir)/myserver/include/server
-serverinclude_HEADERS = clients_thread.h server.h
address@hidden@/myserver/include/server
+include_HEADERS = clients_thread.h server.h
 SUBDIRS =
 
diff --git a/myserver/src/GUI/Makefile.am b/myserver/src/GUI/Makefile.am
index e5beccc..c24f169 100644
--- a/myserver/src/GUI/Makefile.am
+++ b/myserver/src/GUI/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 
 all: copy_files
 
diff --git a/myserver/src/Makefile.am b/myserver/src/Makefile.am
index 20d0b37..cc747c2 100644
--- a/myserver/src/Makefile.am
+++ b/myserver/src/Makefile.am
@@ -15,8 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AM_CPPFLAGS = $(all_includes) -I$(top_builddir)/lib -I$(top_srcdir)/lib
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 
 SUBDIRS = base conf connection connections_scheduler filter http_handler \
        log plugin protocol server GUI
@@ -159,7 +158,7 @@ libmyserver_la_LIBADD =  \
                $(ZLIB_LIB) $(XML_LIBS) \
                $(INTLLIBS) $(LDFLAGS)
 
-myserver_CXXFLAGS = $(CXXFLAGS) -DHOST_STR=\"$(build)\" -DPREFIX=\"$(prefix)\"
+myserver_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS) -DHOST_STR=\"$(build)\" 
-DPREFIX=\"$(prefix)\"
 
 myserver_LDFLAGS = -static -no-install
 myserver_LDADD = libmyserver.la $(PTHREAD_LIB) $(IDN_LIB) \
@@ -167,4 +166,7 @@ myserver_LDADD = libmyserver.la $(PTHREAD_LIB) $(IDN_LIB) \
        $(XML_LIBS) $(INTLLIBS) $(LDFLAGS)
 
 all-local: libmyserver.la myserver${EXEEXT}
-       $(LIBTOOL) --mode=install cp myserver $(abs_top_srcdir)/binaries/
+       $(LIBTOOL) --mode=install cp myserver $(abs_top_builddir)/binaries/
+
+generic-clean:
+       $(LIBTOOL) --mode=uninstall rm -f $(abs_top_builddir)/binaries/myserver
diff --git a/myserver/src/base/Makefile.am b/myserver/src/base/Makefile.am
index 8de5c81..4e133bd 100644
--- a/myserver/src/base/Makefile.am
+++ b/myserver/src/base/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libbase.la
 libbase_la_SOURCES = utility.cpp
 SUBDIRS = base64 bitvec crypt dynamic_lib file exceptions files_cache \
diff --git a/myserver/src/base/base64/Makefile.am 
b/myserver/src/base/base64/Makefile.am
index 3c28aec..85bee47 100644
--- a/myserver/src/base/base64/Makefile.am
+++ b/myserver/src/base/base64/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libbase64.la
 libbase64_la_SOURCES = mime_utils.cpp
 SUBDIRS =
diff --git a/myserver/src/base/bitvec/Makefile.am 
b/myserver/src/base/bitvec/Makefile.am
index 1afac54..04797fc 100644
--- a/myserver/src/base/bitvec/Makefile.am
+++ b/myserver/src/base/bitvec/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libbitvec.la
 libbitvec_la_SOURCES = bitvec.cpp
 SUBDIRS =
diff --git a/myserver/src/base/crypt/Makefile.am 
b/myserver/src/base/crypt/Makefile.am
index 1caa52d..b2b6980 100644
--- a/myserver/src/base/crypt/Makefile.am
+++ b/myserver/src/base/crypt/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libcrypt.la
 libcrypt_la_SOURCES = crypt_algo.cpp crypt_algo_manager.cpp md5.cpp sha1.cpp
 SUBDIRS =
diff --git a/myserver/src/base/dynamic_lib/Makefile.am 
b/myserver/src/base/dynamic_lib/Makefile.am
index 2c2b3cc..308a460 100644
--- a/myserver/src/base/dynamic_lib/Makefile.am
+++ b/myserver/src/base/dynamic_lib/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libdynamic_lib.la
 libdynamic_lib_la_SOURCES = dynamiclib.cpp
 SUBDIRS =
diff --git a/myserver/src/base/exceptions/Makefile.am 
b/myserver/src/base/exceptions/Makefile.am
index d9bd820..e99a44d 100644
--- a/myserver/src/base/exceptions/Makefile.am
+++ b/myserver/src/base/exceptions/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libexceptions.la
 libexceptions_la_SOURCES = checked.cpp exceptions.cpp
 SUBDIRS =
diff --git a/myserver/src/base/file/Makefile.am 
b/myserver/src/base/file/Makefile.am
index 4a13660..0d5c988 100644
--- a/myserver/src/base/file/Makefile.am
+++ b/myserver/src/base/file/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libfile.la
 libfile_la_SOURCES = file.cpp files_utility.cpp
 SUBDIRS =
diff --git a/myserver/src/base/files_cache/Makefile.am 
b/myserver/src/base/files_cache/Makefile.am
index ba62da4..e3a7156 100644
--- a/myserver/src/base/files_cache/Makefile.am
+++ b/myserver/src/base/files_cache/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libfiles_cache.la
 libfiles_cache_la_SOURCES = cached_file_buffer.cpp cached_file.cpp \
                           cached_file_factory.cpp membuf_file.cpp
diff --git a/myserver/src/base/hash_map/Makefile.am 
b/myserver/src/base/hash_map/Makefile.am
index 350e31f..d4a50c5 100644
--- a/myserver/src/base/hash_map/Makefile.am
+++ b/myserver/src/base/hash_map/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhash_map.la
 libhash_map_la_SOURCES = hash_map.cpp
 SUBDIRS =
diff --git a/myserver/src/base/home_dir/Makefile.am 
b/myserver/src/base/home_dir/Makefile.am
index 842dc87..0595e3f 100644
--- a/myserver/src/base/home_dir/Makefile.am
+++ b/myserver/src/base/home_dir/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhome_dir.la
 libhome_dir_la_SOURCES = home_dir.cpp
 SUBDIRS =
diff --git a/myserver/src/base/mem_buff/Makefile.am 
b/myserver/src/base/mem_buff/Makefile.am
index f61f17a..3881d73 100644
--- a/myserver/src/base/mem_buff/Makefile.am
+++ b/myserver/src/base/mem_buff/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libmem_buff.la
 libmem_buff_la_SOURCES = mem_buff.cpp
 SUBDIRS =
diff --git a/myserver/src/base/multicast/Makefile.am 
b/myserver/src/base/multicast/Makefile.am
index 0632475..6c7d805 100644
--- a/myserver/src/base/multicast/Makefile.am
+++ b/myserver/src/base/multicast/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libmulticast.la
 libmulticast_la_SOURCES = multicast.cpp
 SUBDIRS =
diff --git a/myserver/src/base/pipe/Makefile.am 
b/myserver/src/base/pipe/Makefile.am
index 440f949..050324f 100644
--- a/myserver/src/base/pipe/Makefile.am
+++ b/myserver/src/base/pipe/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libpipe.la
 libpipe_la_SOURCES = pipe.cpp
 SUBDIRS =
diff --git a/myserver/src/base/process/Makefile.am 
b/myserver/src/base/process/Makefile.am
index bba48b1..f6c4c94 100644
--- a/myserver/src/base/process/Makefile.am
+++ b/myserver/src/base/process/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libprocess.la
 libprocess_la_SOURCES = fork_server.cpp process.cpp process_server_manager.cpp
 SUBDIRS =
diff --git a/myserver/src/base/read_directory/Makefile.am 
b/myserver/src/base/read_directory/Makefile.am
index 8d5b572..1e0b8a3 100644
--- a/myserver/src/base/read_directory/Makefile.am
+++ b/myserver/src/base/read_directory/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libread_directory.la
 libread_directory_la_SOURCES = read_directory.cpp
 SUBDIRS =
diff --git a/myserver/src/base/regex/Makefile.am 
b/myserver/src/base/regex/Makefile.am
index 6776bb4..4ba2f64 100644
--- a/myserver/src/base/regex/Makefile.am
+++ b/myserver/src/base/regex/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libregex.la
 libregex_la_SOURCES = myserver_regex.cpp
 SUBDIRS =
diff --git a/myserver/src/base/safetime/Makefile.am 
b/myserver/src/base/safetime/Makefile.am
index 90d79c7..061a851 100644
--- a/myserver/src/base/safetime/Makefile.am
+++ b/myserver/src/base/safetime/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libsafetime.la
 libsafetime_la_SOURCES = safetime.cpp
 SUBDIRS =
diff --git a/myserver/src/base/slab/Makefile.am 
b/myserver/src/base/slab/Makefile.am
index 7e1b627..2ce15e1 100644
--- a/myserver/src/base/slab/Makefile.am
+++ b/myserver/src/base/slab/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libslab.la
 libslab_la_SOURCES = slab.cpp
 SUBDIRS =
diff --git a/myserver/src/base/socket/Makefile.am 
b/myserver/src/base/socket/Makefile.am
index 90b2b68..75030e8 100644
--- a/myserver/src/base/socket/Makefile.am
+++ b/myserver/src/base/socket/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libsocket.la
 libsocket_la_SOURCES = socket.cpp ssl_socket.cpp
 SUBDIRS =
diff --git a/myserver/src/base/socket_pair/Makefile.am 
b/myserver/src/base/socket_pair/Makefile.am
index 53540b2..2881d83 100644
--- a/myserver/src/base/socket_pair/Makefile.am
+++ b/myserver/src/base/socket_pair/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libsocket_pair.la
 libsocket_pair_la_SOURCES = socket_pair.cpp
 SUBDIRS =
diff --git a/myserver/src/base/ssl/Makefile.am 
b/myserver/src/base/ssl/Makefile.am
index 0f67678..3e1ac42 100644
--- a/myserver/src/base/ssl/Makefile.am
+++ b/myserver/src/base/ssl/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libssl.la
 libssl_la_SOURCES = ssl.cpp
 SUBDIRS =
diff --git a/myserver/src/base/string/Makefile.am 
b/myserver/src/base/string/Makefile.am
index 9d8c13d..9addade 100644
--- a/myserver/src/base/string/Makefile.am
+++ b/myserver/src/base/string/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libstring.la
 libstring_la_SOURCES = securestr.cpp stringutils.cpp
 SUBDIRS =
diff --git a/myserver/src/base/sync/Makefile.am 
b/myserver/src/base/sync/Makefile.am
index 711953b..63e4869 100644
--- a/myserver/src/base/sync/Makefile.am
+++ b/myserver/src/base/sync/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libsync.la
 libsync_la_SOURCES = event.cpp mutex.cpp read_write_lock.cpp 
recursive_mutex.cpp semaphore.cpp
 SUBDIRS =
diff --git a/myserver/src/base/thread/Makefile.am 
b/myserver/src/base/thread/Makefile.am
index 5763d32..84ec84c 100644
--- a/myserver/src/base/thread/Makefile.am
+++ b/myserver/src/base/thread/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libthread.la
 libthread_la_SOURCES = thread.cpp
 SUBDIRS =
diff --git a/myserver/src/base/unix_socket/Makefile.am 
b/myserver/src/base/unix_socket/Makefile.am
index 6d3eaa2..bfe2d32 100644
--- a/myserver/src/base/unix_socket/Makefile.am
+++ b/myserver/src/base/unix_socket/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libunix_socket.la
 libunix_socket_la_SOURCES = unix_socket.cpp
 SUBDIRS =
diff --git a/myserver/src/base/xml/Makefile.am 
b/myserver/src/base/xml/Makefile.am
index 49c9d5b..48777a1 100644
--- a/myserver/src/base/xml/Makefile.am
+++ b/myserver/src/base/xml/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libxml.la
 libxml_la_SOURCES = xml_parser.cpp
 SUBDIRS =
diff --git a/myserver/src/conf/Makefile.am b/myserver/src/conf/Makefile.am
index e224f25..97d536d 100644
--- a/myserver/src/conf/Makefile.am
+++ b/myserver/src/conf/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libconf.la
 libconf_la_SOURCES = nodetree.cpp xml_conf.cpp
 SUBDIRS = main mime security vhost
diff --git a/myserver/src/conf/main/Makefile.am 
b/myserver/src/conf/main/Makefile.am
index 35d22f6..19ce846 100644
--- a/myserver/src/conf/main/Makefile.am
+++ b/myserver/src/conf/main/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libmain.la
 libmain_la_SOURCES = main_configuration.cpp xml_main_configuration.cpp
 SUBDIRS =
diff --git a/myserver/src/conf/mime/Makefile.am 
b/myserver/src/conf/mime/Makefile.am
index 85038d8..9a68b39 100644
--- a/myserver/src/conf/mime/Makefile.am
+++ b/myserver/src/conf/mime/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libmime.la
 libmime_la_SOURCES = mime_manager.cpp xml_mime_handler.cpp
 SUBDIRS =
diff --git a/myserver/src/conf/security/Makefile.am 
b/myserver/src/conf/security/Makefile.am
index 983647e..305b287 100644
--- a/myserver/src/conf/security/Makefile.am
+++ b/myserver/src/conf/security/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libsecurity.la
 libsecurity_la_SOURCES = auth_domain.cpp auth_method.cpp 
auth_method_factory.cpp security_cache.cpp security_domain.cpp 
security_manager.cpp security_token.cpp validator.cpp validator_factory.cpp 
xml_validator.cpp
 SUBDIRS =
diff --git a/myserver/src/conf/vhost/Makefile.am 
b/myserver/src/conf/vhost/Makefile.am
index 482a739..65098c7 100644
--- a/myserver/src/conf/vhost/Makefile.am
+++ b/myserver/src/conf/vhost/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libvhost.la
 libvhost_la_SOURCES = vhost.cpp vhost_manager.cpp ip.cpp xml_vhost_handler.cpp
 SUBDIRS =
diff --git a/myserver/src/connection/Makefile.am 
b/myserver/src/connection/Makefile.am
index 9839ecd..0a8fee0 100644
--- a/myserver/src/connection/Makefile.am
+++ b/myserver/src/connection/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libconnection.la
 libconnection_la_SOURCES = connection.cpp
 SUBDIRS =
diff --git a/myserver/src/connections_scheduler/Makefile.am 
b/myserver/src/connections_scheduler/Makefile.am
index e8f9d99..ad721b6 100644
--- a/myserver/src/connections_scheduler/Makefile.am
+++ b/myserver/src/connections_scheduler/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libconnections_scheduler.la
 libconnections_scheduler_la_SOURCES = connections_scheduler.cpp 
listen_threads.cpp
 SUBDIRS =
diff --git a/myserver/src/filter/Makefile.am b/myserver/src/filter/Makefile.am
index 348c1f2..f975c91 100644
--- a/myserver/src/filter/Makefile.am
+++ b/myserver/src/filter/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libfilter.la
 libfilter_la_SOURCES = filter.cpp filters_chain.cpp filters_factory.cpp 
memory_stream.cpp stream.cpp \
                        console.cpp
diff --git a/myserver/src/filter/gzip/Makefile.am 
b/myserver/src/filter/gzip/Makefile.am
index 17f1597..a1e8b10 100644
--- a/myserver/src/filter/gzip/Makefile.am
+++ b/myserver/src/filter/gzip/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libgzip.la
 libgzip_la_SOURCES = gzip.cpp gzip_decompress.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/Makefile.am 
b/myserver/src/http_handler/Makefile.am
index ab15fe8..7cf6c93 100644
--- a/myserver/src/http_handler/Makefile.am
+++ b/myserver/src/http_handler/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhttp_handler.la
 libhttp_handler_la_SOURCES =
 SUBDIRS = cgi fastcgi http_dir http_file isapi mscgi proxy scgi wincgi
diff --git a/myserver/src/http_handler/cgi/Makefile.am 
b/myserver/src/http_handler/cgi/Makefile.am
index 2edb58b..e47f5d4 100644
--- a/myserver/src/http_handler/cgi/Makefile.am
+++ b/myserver/src/http_handler/cgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libcgi.la
 libcgi_la_SOURCES = cgi.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/fastcgi/Makefile.am 
b/myserver/src/http_handler/fastcgi/Makefile.am
index 8e5ad8f..f9090cc 100644
--- a/myserver/src/http_handler/fastcgi/Makefile.am
+++ b/myserver/src/http_handler/fastcgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libfastcgi.la
 libfastcgi_la_SOURCES = fastcgi.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/http_dir/Makefile.am 
b/myserver/src/http_handler/http_dir/Makefile.am
index cbadfee..406e17e 100644
--- a/myserver/src/http_handler/http_dir/Makefile.am
+++ b/myserver/src/http_handler/http_dir/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhttp_dir.la
 libhttp_dir_la_SOURCES = http_dir.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/http_file/Makefile.am 
b/myserver/src/http_handler/http_file/Makefile.am
index aeb5b85..ac1be19 100644
--- a/myserver/src/http_handler/http_file/Makefile.am
+++ b/myserver/src/http_handler/http_file/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhttp_file.la
 libhttp_file_la_SOURCES = http_file.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/isapi/Makefile.am 
b/myserver/src/http_handler/isapi/Makefile.am
index 6d0d07c..fc5eab5 100644
--- a/myserver/src/http_handler/isapi/Makefile.am
+++ b/myserver/src/http_handler/isapi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libisapi.la
 libisapi_la_SOURCES = isapi.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/mscgi/Makefile.am 
b/myserver/src/http_handler/mscgi/Makefile.am
index 9052756..fe1665f 100644
--- a/myserver/src/http_handler/mscgi/Makefile.am
+++ b/myserver/src/http_handler/mscgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libmscgi.la
 libmscgi_la_SOURCES = mscgi.cpp mscgi_manager.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/proxy/Makefile.am 
b/myserver/src/http_handler/proxy/Makefile.am
index c1ca885..5468c96 100644
--- a/myserver/src/http_handler/proxy/Makefile.am
+++ b/myserver/src/http_handler/proxy/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libproxy.la
 libproxy_la_SOURCES = proxy.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/scgi/Makefile.am 
b/myserver/src/http_handler/scgi/Makefile.am
index 3b28392..8537788 100644
--- a/myserver/src/http_handler/scgi/Makefile.am
+++ b/myserver/src/http_handler/scgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libscgi.la
 libscgi_la_SOURCES = scgi.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/wincgi/Makefile.am 
b/myserver/src/http_handler/wincgi/Makefile.am
index 76025d9..c9eb43a 100644
--- a/myserver/src/http_handler/wincgi/Makefile.am
+++ b/myserver/src/http_handler/wincgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libwincgi.la
 libwincgi_la_SOURCES = wincgi.cpp
 SUBDIRS =
diff --git a/myserver/src/log/Makefile.am b/myserver/src/log/Makefile.am
index 9a8ce2d..2d86aa5 100644
--- a/myserver/src/log/Makefile.am
+++ b/myserver/src/log/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = liblog.la
 liblog_la_SOURCES = log_manager.cpp
 SUBDIRS = stream
diff --git a/myserver/src/log/stream/Makefile.am 
b/myserver/src/log/stream/Makefile.am
index 51d0d19..8c186e8 100644
--- a/myserver/src/log/stream/Makefile.am
+++ b/myserver/src/log/stream/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libstream.la
 libstream_la_SOURCES = console_stream.cpp file_stream.cpp \
                log_stream.cpp log_stream_factory.cpp \
diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index 156d8dd..f0d49cd 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -16,7 +16,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "myserver.h"
+#include <myserver.h>
 #include <include/server/server.h>
 #include <include/base/file/files_utility.h>
 #include <include/base/string/stringutils.h>
diff --git a/myserver/src/plugin/Makefile.am b/myserver/src/plugin/Makefile.am
index e5d21ad..756eccd 100644
--- a/myserver/src/plugin/Makefile.am
+++ b/myserver/src/plugin/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libplugin.la
 libplugin_la_SOURCES =  plugin.cpp plugin_info.cpp plugins_manager.cpp 
 AM_CPPFLAGS = $(all_includes)
diff --git a/myserver/src/protocol/Makefile.am 
b/myserver/src/protocol/Makefile.am
index d6582a9..12cd8b2 100644
--- a/myserver/src/protocol/Makefile.am
+++ b/myserver/src/protocol/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libprotocol.la
 libprotocol_la_SOURCES = protocol_buffer.cpp protocol.cpp 
protocols_manager.cpp \
                        url.cpp
diff --git a/myserver/src/protocol/control/Makefile.am 
b/myserver/src/protocol/control/Makefile.am
index 4348bba..1ae86cc 100644
--- a/myserver/src/protocol/control/Makefile.am
+++ b/myserver/src/protocol/control/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libcontrol.la
 libcontrol_la_SOURCES = control_header.cpp control_protocol.cpp
 SUBDIRS =
diff --git a/myserver/src/protocol/ftp/Makefile.am 
b/myserver/src/protocol/ftp/Makefile.am
index 6b32ce0..1dbb100 100644
--- a/myserver/src/protocol/ftp/Makefile.am
+++ b/myserver/src/protocol/ftp/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libftp.la
 libftp_la_SOURCES = ftp.cpp ftp_lexer.cpp ftp_parser.cpp
 EXTRA_DIST = ftp_lexer.out.cpp  ftp_parser.ypp  ftp_lexer.lpp
diff --git a/myserver/src/protocol/gopher/Makefile.am 
b/myserver/src/protocol/gopher/Makefile.am
index 5815b8f..1243a7a 100644
--- a/myserver/src/protocol/gopher/Makefile.am
+++ b/myserver/src/protocol/gopher/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libgopher.la
 libgopher_la_SOURCES = gopher.cpp gopher_content.cpp engine.cpp
 AM_CPPFLAGS = $(all_includes)
diff --git a/myserver/src/protocol/http/Makefile.am 
b/myserver/src/protocol/http/Makefile.am
index 23c540f..ea23860 100644
--- a/myserver/src/protocol/http/Makefile.am
+++ b/myserver/src/protocol/http/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhttp.la
 libhttp_la_SOURCES = http.cpp http_data_handler.cpp http_data_read.cpp \
                   http_errors.cpp  http_header.cpp http_headers.cpp \
diff --git a/myserver/src/protocol/http/env/Makefile.am 
b/myserver/src/protocol/http/env/Makefile.am
index 2e67a80..6bcd83f 100644
--- a/myserver/src/protocol/http/env/Makefile.am
+++ b/myserver/src/protocol/http/env/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libenv.la
 libenv_la_SOURCES = env.cpp
 SUBDIRS =
diff --git a/myserver/src/protocol/https/Makefile.am 
b/myserver/src/protocol/https/Makefile.am
index dc0be0b..16c3951 100644
--- a/myserver/src/protocol/https/Makefile.am
+++ b/myserver/src/protocol/https/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhttps.la
 libhttps_la_SOURCES = https.cpp
 SUBDIRS =
diff --git a/myserver/src/server/Makefile.am b/myserver/src/server/Makefile.am
index 89cf371..75b6609 100644
--- a/myserver/src/server/Makefile.am
+++ b/myserver/src/server/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libserver.la
 libserver_la_SOURCES = clients_thread.cpp server.cpp
 SUBDIRS =
diff --git a/myserver/tests/Makefile.am b/myserver/tests/Makefile.am
index bed6775..61a127e 100644
--- a/myserver/tests/Makefile.am
+++ b/myserver/tests/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 noinst_PROGRAMS = test_suite
 test_suite_SOURCES =   main.cpp                                \
                        memory_socket.h                         \

-----------------------------------------------------------------------

Summary of changes:
 myserver/Makefile.am                               |    9 +++++++--
 myserver/binaries/Makefile.am                      |    5 -----
 myserver/binaries/certificates/Makefile.am         |    2 +-
 myserver/binaries/web/cgi-src/math_sum/Makefile.am |    5 ++++-
 myserver/binaries/web/cgi-src/post/Makefile.am     |    5 ++++-
 myserver/documentation/Makefile.am                 |   13 ++++++++++---
 myserver/include/Makefile.am                       |    7 ++-----
 myserver/include/base/Makefile.am                  |   11 +++++++----
 myserver/include/base/base64/Makefile.am           |    5 +++--
 myserver/include/base/bitvec/Makefile.am           |    4 ++--
 myserver/include/base/crypt/Makefile.am            |    4 ++--
 myserver/include/base/dynamic_lib/Makefile.am      |    4 ++--
 myserver/include/base/exceptions/Makefile.am       |    4 ++--
 myserver/include/base/file/Makefile.am             |    4 ++--
 myserver/include/base/files_cache/Makefile.am      |    4 ++--
 myserver/include/base/hash_map/Makefile.am         |    4 ++--
 myserver/include/base/home_dir/Makefile.am         |    4 ++--
 myserver/include/base/mem_buff/Makefile.am         |    4 ++--
 myserver/include/base/multicast/Makefile.am        |    4 ++--
 myserver/include/base/pipe/Makefile.am             |    4 ++--
 myserver/include/base/process/Makefile.am          |    4 ++--
 myserver/include/base/read_directory/Makefile.am   |    4 ++--
 myserver/include/base/regex/Makefile.am            |    4 ++--
 myserver/include/base/safetime/Makefile.am         |    4 ++--
 myserver/include/base/slab/Makefile.am             |    4 ++--
 myserver/include/base/socket/Makefile.am           |    4 ++--
 myserver/include/base/socket_pair/Makefile.am      |    4 ++--
 myserver/include/base/ssl/Makefile.am              |    4 ++--
 myserver/include/base/string/Makefile.am           |    4 ++--
 myserver/include/base/sync/Makefile.am             |    4 ++--
 myserver/include/base/thread/Makefile.am           |    4 ++--
 myserver/include/base/unix_socket/Makefile.am      |    4 ++--
 myserver/include/base/xml/Makefile.am              |    4 ++--
 myserver/include/conf/Makefile.am                  |    4 ++--
 myserver/include/conf/main/Makefile.am             |    4 ++--
 myserver/include/conf/mime/Makefile.am             |    4 ++--
 myserver/include/conf/security/Makefile.am         |    4 ++--
 myserver/include/conf/vhost/Makefile.am            |    4 ++--
 myserver/include/connection/Makefile.am            |    4 ++--
 myserver/include/connections_scheduler/Makefile.am |    4 ++--
 myserver/include/filter/Makefile.am                |    4 ++--
 myserver/include/filter/gzip/Makefile.am           |    4 ++--
 myserver/include/http_handler/Makefile.am          |    4 ++--
 myserver/include/http_handler/cgi/Makefile.am      |    4 ++--
 myserver/include/http_handler/fastcgi/Makefile.am  |    4 ++--
 myserver/include/http_handler/http_dir/Makefile.am |    4 ++--
 .../include/http_handler/http_file/Makefile.am     |    4 ++--
 myserver/include/http_handler/isapi/Makefile.am    |    4 ++--
 myserver/include/http_handler/mscgi/Makefile.am    |    4 ++--
 myserver/include/http_handler/proxy/Makefile.am    |    4 ++--
 myserver/include/http_handler/scgi/Makefile.am     |    4 ++--
 myserver/include/http_handler/wincgi/Makefile.am   |    4 ++--
 myserver/include/log/Makefile.am                   |    4 ++--
 myserver/include/log/stream/Makefile.am            |    4 ++--
 myserver/include/plugin/Makefile.am                |    4 ++--
 myserver/include/protocol/Makefile.am              |    4 ++--
 myserver/include/protocol/control/Makefile.am      |    4 ++--
 myserver/include/protocol/ftp/Makefile.am          |    4 ++--
 myserver/include/protocol/gopher/Makefile.am       |    4 ++--
 myserver/include/protocol/http/Makefile.am         |    4 ++--
 myserver/include/protocol/http/env/Makefile.am     |    4 ++--
 myserver/include/protocol/https/Makefile.am        |    4 ++--
 myserver/include/server/Makefile.am                |    4 ++--
 myserver/src/GUI/Makefile.am                       |    2 +-
 myserver/src/Makefile.am                           |   10 ++++++----
 myserver/src/base/Makefile.am                      |    2 +-
 myserver/src/base/base64/Makefile.am               |    2 +-
 myserver/src/base/bitvec/Makefile.am               |    2 +-
 myserver/src/base/crypt/Makefile.am                |    2 +-
 myserver/src/base/dynamic_lib/Makefile.am          |    2 +-
 myserver/src/base/exceptions/Makefile.am           |    2 +-
 myserver/src/base/file/Makefile.am                 |    2 +-
 myserver/src/base/files_cache/Makefile.am          |    2 +-
 myserver/src/base/hash_map/Makefile.am             |    2 +-
 myserver/src/base/home_dir/Makefile.am             |    2 +-
 myserver/src/base/mem_buff/Makefile.am             |    2 +-
 myserver/src/base/multicast/Makefile.am            |    2 +-
 myserver/src/base/pipe/Makefile.am                 |    2 +-
 myserver/src/base/process/Makefile.am              |    2 +-
 myserver/src/base/read_directory/Makefile.am       |    2 +-
 myserver/src/base/regex/Makefile.am                |    2 +-
 myserver/src/base/safetime/Makefile.am             |    2 +-
 myserver/src/base/slab/Makefile.am                 |    2 +-
 myserver/src/base/socket/Makefile.am               |    2 +-
 myserver/src/base/socket_pair/Makefile.am          |    2 +-
 myserver/src/base/ssl/Makefile.am                  |    2 +-
 myserver/src/base/string/Makefile.am               |    2 +-
 myserver/src/base/sync/Makefile.am                 |    2 +-
 myserver/src/base/thread/Makefile.am               |    2 +-
 myserver/src/base/unix_socket/Makefile.am          |    2 +-
 myserver/src/base/xml/Makefile.am                  |    2 +-
 myserver/src/conf/Makefile.am                      |    2 +-
 myserver/src/conf/main/Makefile.am                 |    2 +-
 myserver/src/conf/mime/Makefile.am                 |    2 +-
 myserver/src/conf/security/Makefile.am             |    2 +-
 myserver/src/conf/vhost/Makefile.am                |    2 +-
 myserver/src/connection/Makefile.am                |    2 +-
 myserver/src/connections_scheduler/Makefile.am     |    2 +-
 myserver/src/filter/Makefile.am                    |    2 +-
 myserver/src/filter/gzip/Makefile.am               |    2 +-
 myserver/src/http_handler/Makefile.am              |    2 +-
 myserver/src/http_handler/cgi/Makefile.am          |    2 +-
 myserver/src/http_handler/fastcgi/Makefile.am      |    2 +-
 myserver/src/http_handler/http_dir/Makefile.am     |    2 +-
 myserver/src/http_handler/http_file/Makefile.am    |    2 +-
 myserver/src/http_handler/isapi/Makefile.am        |    2 +-
 myserver/src/http_handler/mscgi/Makefile.am        |    2 +-
 myserver/src/http_handler/proxy/Makefile.am        |    2 +-
 myserver/src/http_handler/scgi/Makefile.am         |    2 +-
 myserver/src/http_handler/wincgi/Makefile.am       |    2 +-
 myserver/src/log/Makefile.am                       |    2 +-
 myserver/src/log/stream/Makefile.am                |    2 +-
 myserver/src/myserver.cpp                          |    2 +-
 myserver/src/plugin/Makefile.am                    |    2 +-
 myserver/src/protocol/Makefile.am                  |    2 +-
 myserver/src/protocol/control/Makefile.am          |    2 +-
 myserver/src/protocol/ftp/Makefile.am              |    2 +-
 myserver/src/protocol/gopher/Makefile.am           |    2 +-
 myserver/src/protocol/http/Makefile.am             |    2 +-
 myserver/src/protocol/http/env/Makefile.am         |    2 +-
 myserver/src/protocol/https/Makefile.am            |    2 +-
 myserver/src/server/Makefile.am                    |    2 +-
 myserver/tests/Makefile.am                         |    2 +-
 123 files changed, 211 insertions(+), 195 deletions(-)


hooks/post-receive
-- 
GNU MyServer




reply via email to

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