summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorJoel Klinghed <the_jk@yahoo.com>2017-07-23 01:20:04 +0200
committerJoel Klinghed <the_jk@yahoo.com>2017-07-23 01:20:04 +0200
commit4f9cb7f330beab9fb09f52421b2dbd15835476e2 (patch)
tree328517eb3aeea310d0328c08953f57ae663e8d75 /src/Makefile.am
parentc278eac390bd37c5ca8b319ed15605211822c08f (diff)
Add proxy to GUI
Access via "Setup..." in main menu Uses a socketpair to connect monitor so only proxy port is open
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am27
1 files changed, 18 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 9cd0884..b25378d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ AM_CXXFLAGS = @DEFINES@
ARFLAGS = cr
bin_PROGRAMS = tp tp-monitor
-noinst_LIBRARIES = libtp.a libmonitor.a libattrstr.a
+noinst_LIBRARIES = libtp.a libproxy.a libmonitor.a libattrstr.a
if HAVE_SSL
bin_PROGRAMS += tp-genca
noinst_LIBRARIES += libmitm.a
@@ -20,13 +20,16 @@ bin_PROGRAMS += tp-monitor-qt
noinst_LIBRARIES += libmonitor_gui.a
endif
-tp_SOURCES = main.cc proxy.cc logger.cc resolver.cc
-tp_LDADD = libtp.a @THREAD_LIBS@
+tp_SOURCES = main.cc
+tp_LDADD = libproxy.a libtp.a @THREAD_LIBS@
if HAVE_SSL
tp_LDADD += libmitm.a @SSL_LIBS@
endif
tp_CXXFLAGS = $(AM_CXXFLAGS) -DVERSION='"@VERSION@"' @THREAD_CFLAGS@
+libproxy_a_SOURCES = proxy.cc resolver.cc logger.cc
+libproxy_a_CXXFLAGS = $(AM_CXXFLAGS) -DVERSION='"@VERSION@"' @THREAD_CFLAGS@
+
libtp_a_SOURCES = args.cc xdg.cc terminal.cc http.cc url.cc paths.cc \
character.cc config.cc strings.cc io.cc looper.cc \
buffer.cc chunked.cc
@@ -48,10 +51,10 @@ tp_genca_SOURCES = genca.cc logger.cc
tp_genca_LDADD = libmitm.a libtp.a @SSL_LIBS@
tp_genca_CXXFLAGS = $(AM_CXXFLAGS) -DVERSION='"@VERSION@"'
-libmonitor_a_SOURCES = monitor.cc resolver.cc
+libmonitor_a_SOURCES = monitor.cc
libmonitor_a_CXXFLAGS = $(AM_CXXFLAGS) -DVERSION='"@VERSION@"' @THREAD_CFLAGS@
-tp_monitor_SOURCES = monitor-cmd.cc
+tp_monitor_SOURCES = monitor-cmd.cc resolver.cc
tp_monitor_LDADD = libmonitor.a libtp.a @THREAD_LIBS@
tp_monitor_CXXFLAGS = $(AM_CXXFLAGS) -DVERSION='"@VERSION@"' @THREAD_CFLAGS@
@@ -62,13 +65,19 @@ libmonitor_gui_a_CXXFLAGS = $(AM_CXXFLAGS) -DVERSION='"@VERSION@"' \
libattrstr_a_SOURCES = gui_attrtext.cc gui_htmlattrtext.cc
tp_monitor_gtk_SOURCES = gui_gtk.cc
-tp_monitor_gtk_LDADD = libmonitor_gui.a libattrstr.a libmonitor.a libtp.a \
- @GTK_LIBS@ @THREAD_LIBS@
+tp_monitor_gtk_LDADD = libmonitor_gui.a libattrstr.a libproxy.a libmonitor.a \
+ libtp.a @GTK_LIBS@ @THREAD_LIBS@
+if HAVE_SSL
+tp_monitor_gtk_LDADD += libmitm.a @SSL_LIBS@
+endif
tp_monitor_gtk_CXXFLAGS = $(AM_CXXFLAGS) -DVERSION='"@VERSION@"' \
@GTK_CFLAGS@ @THREAD_CFLAGS@ -Wno-unused-function
tp_monitor_qt_SOURCES = gui_qt.cc
-tp_monitor_qt_LDADD = libmonitor_gui.a libattrstr.a libmonitor.a libtp.a \
- @QT_LIBS@ @THREAD_LIBS@
+tp_monitor_qt_LDADD = libmonitor_gui.a libattrstr.a libmonitor.a libproxy.a \
+ libtp.a @QT_LIBS@ @THREAD_LIBS@
+if HAVE_SSL
+tp_monitor_qt_LDADD += libmitm.a @SSL_LIBS@
+endif
tp_monitor_qt_CXXFLAGS = $(AM_CXXFLAGS) -DVERSION='"@VERSION@"' \
@QT_CFLAGS@ @THREAD_CFLAGS@