Remove complus support.

diff --git a/ChangeLog b/ChangeLog
index 852a0451637883fa68fbc9703b4af28e8d88c854..f5eefa6de156eab9e3e5133514352675ff1309a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-05-06  Marcus Brinkmann  <marcus@g10code.com>
 
+       * Makefile.am (SUBDIRS): Remove complus.
+
        * configure.ac (AC_CONFIG_FILES): Remove complus/Makefile.
        (BUILD_COMPLUS): Remove AM_CONDITIONAL.
        * complus/: Remove very old and stale component.

diff --git a/Makefile.am b/Makefile.am
index cc619f7715f8234ae9211dae998f727bbfff0664..fb0686709d9ee70bf55ea091bb523644347ae8e8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,19 +27,13 @@ DISTCHECK_CONFIGURE_FLAGS = --with-gpg="@GPG@"
 EXTRA_DIST = gpgme.spec.in autogen.sh 
 
 
-if BUILD_COMPLUS
-complus = complus
-else
-complus = 
-endif
-
 if RUN_GPG_TESTS
 tests = tests
 else
 tests = 
 endif
 
-SUBDIRS = src ${tests} doc ${complus} lang
+SUBDIRS = src ${tests} doc lang
 
 # Fix the version of the spec file and create a file named VERSION 
 # to be used for patch's Prereq: feature.