Merge branch 'packet_edit' into autotools-fix(releng)

[ultramonkey-l7/sslproxy.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 6c3db25..c200632 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,23 +1,22 @@
 sbin_PROGRAMS  = sslproxy
-AUTOMAKE_OPTIONS = foreign
-SSLPROXY_SBINDIR = @sbindir@
+dist_sbin_SCRIPTS = sslproxyadm
 
-sslproxy_CPPFLAGS      = -O2 -g -I../include \
-                 -I../logger -I../parameter \
+sslproxy_CPPFLAGS      = -O2 -g -I$(top_srcdir)/include \
+                 -I$(top_srcdir)/logger -I$(top_srcdir)/parameter \
                  -I/usr/local/include/boost \
                  -pthread \
                  -DVERSION=\"$(VERSION)\"
 
 sslproxy_SOURCES       =       \
-                       ../logger/logger_wrapper.h \
-                       ../parameter/parameter_wrapper.h \
-                       ../include/sslproxy.h \
-                       ../include/sslproxyserver.h \
-                       ../include/sslproxysession.h \
-                       ../include/packet_editor.h \
-                       ../include/http_message.h \
-                       ../include/http_request.h \
-                       ../include/http_response.h \
+                       $(top_srcdir)/logger/logger_wrapper.h \
+                       $(top_srcdir)/parameter/parameter_wrapper.h \
+                       $(top_srcdir)/include/sslproxy.h \
+                       $(top_srcdir)/include/sslproxyserver.h \
+                       $(top_srcdir)/include/sslproxysession.h \
+                       $(top_srcdir)/include/packet_editor.h \
+                       $(top_srcdir)/include/http_message.h \
+                       $(top_srcdir)/include/http_request.h \
+                       $(top_srcdir)/include/http_response.h \
                        sslproxy.cpp \
                        sslproxymain.cpp \
                        sslproxyserver.cpp \
@@ -27,18 +26,11 @@ sslproxy_SOURCES    =       \
                        http_request.cpp \
                        http_response.cpp
 
-sslproxy_LDADD =       ../logger/libsslproxy_logger.a \
-                       ../parameter/libsslproxy_parameter.a \
+sslproxy_LDADD =       $(top_builddir)/logger/libsslproxy_logger.a \
+                       $(top_builddir)/parameter/libsslproxy_parameter.a \
                        -llog4cxx \
                        -lrt \
                        -lssl \
                        -lboost_regex-gcc41-mt \
                        -lboost_system-gcc41-mt \
                        -lboost_thread-gcc41-mt
-
-install:
-       $(INSTALL) -m 755 -D \
-               ./sslproxy \
-               ./sslproxyadm \
-               $(SSLPROXY_SBINDIR)
-       mkdir -p /var/log/l7vs/sslproxy