aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.am8
2 files changed, 3 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 852a0451..f5eefa6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2011-05-06 Marcus Brinkmann <[email protected]>
+ * 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 cc619f77..fb068670 100644
--- 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.