Infrastructure: Get it building again, using pkg-config.

[tripe] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 144671da21e38b9c406c8fa504cc9a6fe5c210c4..ef430751f9461ac69b0d96b497500e2ad649a2cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,55 +15,21 @@
 ## it under the terms of the GNU General Public License as published by
 ## the Free Software Foundation; either version 2 of the License, or
 ## (at your option) any later version.
-## 
+##
 ## TrIPE is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
-## 
+##
 ## You should have received a copy of the GNU General Public License
 ## along with TrIPE; if not, write to the Free Software Foundation,
 ## Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = doc @DIRS@
-configdir = @configdir@
-socketdir = @socketdir@
-logdir = @logdir@
-
-CATACOMB_LIBS = @CATACOMB_LIBS@
-tun = @tun@
-
-sbin_PROGRAMS = tripe
-bin_PROGRAMS = tripectl tripe-mitm pkstream
-noinst_SCRIPTS = tripe-init
-bin_SCRIPTS = @pyscripts@ @pygtkscripts@
-PYTHONSCRIPTS = tripe-keys
-PYGTKSCRIPTS = tripemon
-EXTRA_SCRIPTS = ${PYTHONSCRIPTS} ${PYGTKSCRIPTS}
-tripe_SOURCES = \
-       tripe.c tripe.h tripe-protocol.h \
-       admin.c peer.c \
-       keymgmt.c keyexch.c keyset.c chal.c \
-       servutil.c util.c util.h \
-       tun-unet.c tun-bsd.c tun-linux.c tun-slip.c
-tripe_LDADD = $(CATACOMB_LIBS)
-tripectl_SOURCES = \
-       client.c util.c util.h
-tripe_mitm_SOURCES = \
-       mallory.c
-tripe_mitm_LDADD = $(CATACOMB_LIBS)
-pkstream_SOURCES = \
-       pkstream.c
-
-install-hook:
-       for i in "$(configdir)" "$(socketdir)"; do \
-         case "$$i" in /*) $(mkinstalldirs) $(DESTDIR)$$i;; esac; \
-       done
+SUBDIRS = common client server proxy pkstream init doc @DIRS@
 
-EXTRA_DIST = tripe.conf \
+EXTRA_DIST = \
        debian/rules debian/control debian/changelog debian/copyright \
-       debian/tripe.postinst debian/tripe.prerm debian/tripe.postrm \
-       tripe-keys.in
+       debian/tripe.postinst debian/tripe.prerm debian/tripe.postrm
 
 ##----- That's all, folks ---------------------------------------------------