GNOME.org
 

[tepl] Remove the Amtk shared library

commit 304dd1716b0f53be4d0f29e4481dab3d8cc4b96f
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Mon Apr 9 17:45:50 2018 +0200

    Remove the Amtk shared library
    
    It has been moved to its own git repository.

 Makefile.am                             |   7 +-
 amtk.pc.in                              |  12 -
 amtk/Makefile.am                        | 146 ------
 amtk/NOTES                              |  40 --
 amtk/amtk-action-info-central-store.c   | 170 -------
 amtk/amtk-action-info-central-store.h   |  73 ---
 amtk/amtk-action-info-store.c           | 235 ----------
 amtk/amtk-action-info-store.h           |  75 ---
 amtk/amtk-action-info.c                 | 424 -----------------
 amtk/amtk-action-info.h                 | 108 -----
 amtk/amtk-action-map.c                  | 105 -----
 amtk/amtk-action-map.h                  |  38 --
 amtk/amtk-application-window.c          | 644 --------------------------
 amtk/amtk-application-window.h          |  82 ----
 amtk/amtk-enum-types.c.template         |  41 --
 amtk/amtk-enum-types.h.template         |  30 --
 amtk/amtk-factory.c                     | 791 --------------------------------
 amtk/amtk-factory.h                     | 130 ------
 amtk/amtk-init.c                        |  94 ----
 amtk/amtk-init.h                        |  36 --
 amtk/amtk-menu-item.c                   | 174 -------
 amtk/amtk-menu-item.h                   |  41 --
 amtk/amtk-menu-shell.c                  | 413 -----------------
 amtk/amtk-menu-shell.h                  |  74 ---
 amtk/amtk-types.h                       |  41 --
 amtk/amtk-utils.c                       | 425 -----------------
 amtk/amtk-utils.h                       |  60 ---
 amtk/amtk.h                             |  41 --
 configure.ac                            |  25 +-
 docs/reference/Makefile.am              |  18 +-
 docs/reference/amtk-intro.xml.in        | 153 ------
 docs/reference/intro.xml.in             |  22 -
 docs/reference/tepl-4.0-sections.txt    | 162 -------
 docs/reference/tepl-docs.xml.in         |  19 -
 po/POTFILES.in                          |  10 -
 tepl.pc.in                              |   2 +-
 tepl/Makefile.am                        |  18 +-
 tests/Makefile.am                       |   9 -
 tests/test-menu.c                       | 233 ----------
 testsuite/Makefile.am                   |  19 -
 testsuite/amtk/test-action-info-store.c |  72 ---
 testsuite/amtk/test-action-map.c        | 105 -----
 testsuite/amtk/test-utils.c             |  92 ----
 43 files changed, 19 insertions(+), 5490 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0a44b0f..91eb8cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,14 @@
-SUBDIRS = po amtk tepl tests testsuite docs
+SUBDIRS = po tepl tests testsuite docs
 
 @CODE_COVERAGE_RULES@
 
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
 
-pkgconfig_DATA =                       \
-       amtk-$(TEPL_API_VERSION).pc     \
-       tepl-$(TEPL_API_VERSION).pc
+pkgconfig_DATA = tepl-$(TEPL_API_VERSION).pc
 
 DISTCLEANFILES = $(pkgconfig_DATA)
 
 EXTRA_DIST =           \
-       amtk.pc.in      \
        tepl.pc.in      \
        tepl.doap       \
        HACKING
diff --git a/configure.ac b/configure.ac
index a6a54a4..900f3f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,13 +33,6 @@ AX_IS_RELEASE([git-directory])
 #
 # When incrementing the API version (usually for a new major package version),
 # set CURRENT, REVISION and AGE to 0 since it's like a new library.
-
-AMTK_LT_CURRENT=0
-AMTK_LT_REVISION=0
-AMTK_LT_AGE=0
-AMTK_LT_VERSION="$AMTK_LT_CURRENT:$AMTK_LT_REVISION:$AMTK_LT_AGE"
-AC_SUBST([AMTK_LT_VERSION])
-
 TEPL_LT_CURRENT=0
 TEPL_LT_REVISION=0
 TEPL_LT_AGE=0
@@ -53,12 +46,13 @@ AC_SUBST([TEPL_LT_VERSION])
 # Because as far as I've tested, it is not easily feasible to not hardcode the
 # API version in those places (swilmet).
 TEPL_API_VERSION=4
-AC_SUBST(TEPL_API_VERSION)
+AC_SUBST([TEPL_API_VERSION])
 
 # Dependencies
 glib_req=2.52
 gtk_req=3.22
 gtksourceview_req=4.0
+amtk_req=4.99.0
 libxml_req=2.5
 
 AC_CONFIG_SRCDIR([tepl/tepl.h])
@@ -66,7 +60,7 @@ AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 # gnu strictness to generate the INSTALL file
-AM_INIT_AUTOMAKE([1.14 tar-ustar dist-xz no-dist-gzip gnu subdir-objects -Wno-portability])
+AM_INIT_AUTOMAKE([1.14 tar-ustar dist-xz no-dist-gzip gnu -Wno-portability])
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -92,15 +86,9 @@ AX_COMPILER_FLAGS([WARN_CFLAGS], [WARN_LDFLAGS], [yes])
 
 # Dynamic linking dependencies
 AX_REQUIRE_DEFINED([AX_PKG_CHECK_MODULES])
-AX_PKG_CHECK_MODULES([AMTK_DEP],
-                    [glib-2.0 >= $glib_req  gtk+-3.0 >= $gtk_req],
-                    [],
-                    [], [],
-                    [AMTK_PACKAGE_REQUIRES],
-                    [AMTK_PACKAGE_REQUIRES_PRIVATE])
-
+# TODO simplify
 AX_PKG_CHECK_MODULES([TEPL_DEP],
-                    [glib-2.0 >= $glib_req  gtk+-3.0 >= $gtk_req  gtksourceview-4 >= $gtksourceview_req],
+                    [glib-2.0 >= $glib_req  gtk+-3.0 >= $gtk_req  gtksourceview-4 >= $gtksourceview_req  
amtk-5 >= $amtk_req],
                     [libxml-2.0 >= $libxml_req  uchardet],
                     [], [],
                     [TEPL_PACKAGE_REQUIRES],
@@ -151,12 +139,9 @@ PKG_CHECK_VAR([GLIB_PREFIX], [glib-2.0], [prefix])
 
 # Output files
 AC_CONFIG_FILES([
-       amtk-${TEPL_API_VERSION}.pc:amtk.pc.in
        tepl-${TEPL_API_VERSION}.pc:tepl.pc.in
        Makefile
-       amtk/Makefile
        docs/Makefile
-       docs/reference/amtk-intro.xml
        docs/reference/intro.xml
        docs/reference/Makefile
        docs/reference/tepl-docs.xml
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 35780a5..5c57893 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -15,16 +15,15 @@ DOC_MAIN_SGML_FILE = tepl-docs.xml
 SCAN_OPTIONS = --rebuild-types
 
 # The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR = $(top_srcdir)/tepl $(top_srcdir)/amtk
+DOC_SOURCE_DIR = $(top_srcdir)/tepl
 
 # Used for dependencies
-HFILE_GLOB = $(top_srcdir)/tepl/*.h $(top_srcdir)/amtk/*.h
-CFILE_GLOB = $(top_srcdir)/tepl/*.c $(top_srcdir)/amtk/*.c
+HFILE_GLOB = $(top_srcdir)/tepl/*.h
+CFILE_GLOB = $(top_srcdir)/tepl/*.c
 
 # Header files or dirs to ignore when scanning. Use base file/dir names
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
 IGNORE_HFILES =                                        \
-       amtk.h                                  \
        tepl.h                                  \
        tepl-buffer-input-stream.h              \
        tepl-close-confirm-dialog-single.h      \
@@ -45,7 +44,6 @@ HTML_IMAGES =
 
 # Extra XML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =                        \
-       amtk-intro.xml          \
        api-breaks.xml          \
        intro.xml               \
        porting-guides.xml
@@ -56,11 +54,9 @@ FIXXREF_OPTIONS =
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 # Only needed if you are using gtkdoc-scangobj to dynamically query widget
 # signals and properties.
-GTKDOC_CFLAGS = -I$(top_srcdir) $(AMTK_DEP_CFLAGS) $(TEPL_DEP_CFLAGS)
+GTKDOC_CFLAGS = -I$(top_srcdir) $(TEPL_DEP_CFLAGS)
 GTKDOC_LIBS =                                                  \
-       $(top_builddir)/amtk/libamtk-@TEPL_API_VERSION@.la      \
        $(top_builddir)/tepl/libtepl-@TEPL_API_VERSION@.la      \
-       $(AMTK_DEP_LIBS)                                        \
        $(TEPL_DEP_LIBS)
 
 MAINTAINERCLEANFILES =                 \
@@ -71,13 +67,11 @@ MAINTAINERCLEANFILES =                      \
 include $(top_srcdir)/gtk-doc.make
 
 EXTRA_DIST +=                  \
-       amtk-intro.xml.in       \
        intro.xml.in            \
        tepl-docs.xml.in
 
-DISTCLEANFILES =               \
-       amtk-intro.xml          \
-       intro.xml               \
+DISTCLEANFILES =       \
+       intro.xml       \
        tepl-docs.xml
 
 -include $(top_srcdir)/git.mk
diff --git a/docs/reference/intro.xml.in b/docs/reference/intro.xml.in
index eec10f1..11e4ca6 100644
--- a/docs/reference/intro.xml.in
+++ b/docs/reference/intro.xml.in
@@ -133,28 +133,6 @@
     </para>
   </refsect1>
 
-  <refsect1>
-    <title>Amtk - Actions, Menus and Toolbars Kit for GTK+</title>
-
-    <para>
-      As yak shaving, another shared library called Amtk has been developed.
-      Because with GTK+ alone, it is no longer possible to create a traditional
-      UI in a convenient way without using deprecated APIs (that have been
-      removed in GTK+&nbsp;4).
-    </para>
-
-    <para>
-      Amtk has been developed with libraries like Tepl in mind. This has the
-      nice benefit that action information is shared (see
-      <link 
linkend="tepl-application-get-tepl-action-info-store">tepl_application_get_tepl_action_info_store()</link>).
-    </para>
-
-    <para>
-      Read the <link linkend="amtk-intro">Amtk introduction</link> for more
-      information.
-    </para>
-  </refsect1>
-
   <refsect1>
     <title>GTK+ and GtkSourceView dependencies</title>
     <para>
diff --git a/docs/reference/tepl-4.0-sections.txt b/docs/reference/tepl-4.0-sections.txt
index 52ac42f..a9f7898 100644
--- a/docs/reference/tepl-4.0-sections.txt
+++ b/docs/reference/tepl-4.0-sections.txt
@@ -1,165 +1,3 @@
-<INCLUDE>amtk/amtk.h</INCLUDE>
-
-<SECTION>
-<FILE>amtk-init</FILE>
-<TITLE>Amtk Initialization and Finalization</TITLE>
-amtk_init
-amtk_finalize
-</SECTION>
-
-<SECTION>
-<FILE>amtk-application-window</FILE>
-AmtkApplicationWindow
-amtk_application_window_get_from_gtk_application_window
-amtk_application_window_get_application_window
-amtk_application_window_get_statusbar
-amtk_application_window_set_statusbar
-amtk_application_window_connect_menu_to_statusbar
-amtk_application_window_connect_recent_chooser_menu_to_statusbar
-amtk_application_window_create_open_recent_menu
-amtk_application_window_create_open_recent_menu_item
-<SUBSECTION Standard>
-AMTK_APPLICATION_WINDOW
-AMTK_APPLICATION_WINDOW_CLASS
-AMTK_APPLICATION_WINDOW_GET_CLASS
-AMTK_IS_APPLICATION_WINDOW
-AMTK_IS_APPLICATION_WINDOW_CLASS
-AMTK_TYPE_APPLICATION_WINDOW
-AmtkApplicationWindowClass
-AmtkApplicationWindowPrivate
-amtk_application_window_get_type
-</SECTION>
-
-<SECTION>
-<FILE>amtk-action-info</FILE>
-AmtkActionInfo
-AmtkActionInfoEntry
-amtk_action_info_new
-amtk_action_info_new_from_entry
-amtk_action_info_ref
-amtk_action_info_unref
-amtk_action_info_copy
-amtk_action_info_get_action_name
-amtk_action_info_set_action_name
-amtk_action_info_get_icon_name
-amtk_action_info_set_icon_name
-amtk_action_info_get_label
-amtk_action_info_set_label
-amtk_action_info_get_tooltip
-amtk_action_info_set_tooltip
-amtk_action_info_get_accels
-amtk_action_info_set_accels
-amtk_action_info_mark_as_used
-amtk_action_info_has_been_used
-<SUBSECTION Standard>
-amtk_action_info_get_type
-AMTK_TYPE_ACTION_INFO
-</SECTION>
-
-<SECTION>
-<FILE>amtk-action-info-store</FILE>
-AmtkActionInfoStore
-amtk_action_info_store_new
-amtk_action_info_store_add
-amtk_action_info_store_add_entries
-amtk_action_info_store_lookup
-amtk_action_info_store_check_all_used
-<SUBSECTION Standard>
-AMTK_ACTION_INFO_STORE
-AMTK_ACTION_INFO_STORE_CLASS
-AMTK_ACTION_INFO_STORE_GET_CLASS
-AMTK_IS_ACTION_INFO_STORE
-AMTK_IS_ACTION_INFO_STORE_CLASS
-AMTK_TYPE_ACTION_INFO_STORE
-AmtkActionInfoStoreClass
-AmtkActionInfoStorePrivate
-amtk_action_info_store_get_type
-</SECTION>
-
-<SECTION>
-<FILE>amtk-action-info-central-store</FILE>
-AmtkActionInfoCentralStore
-amtk_action_info_central_store_get_singleton
-amtk_action_info_central_store_lookup
-<SUBSECTION Standard>
-AMTK_ACTION_INFO_CENTRAL_STORE
-AMTK_ACTION_INFO_CENTRAL_STORE_CLASS
-AMTK_ACTION_INFO_CENTRAL_STORE_GET_CLASS
-AMTK_IS_ACTION_INFO_CENTRAL_STORE
-AMTK_IS_ACTION_INFO_CENTRAL_STORE_CLASS
-AMTK_TYPE_ACTION_INFO_CENTRAL_STORE
-AmtkActionInfoCentralStoreClass
-AmtkActionInfoCentralStorePrivate
-amtk_action_info_central_store_get_type
-</SECTION>
-
-<SECTION>
-<FILE>amtk-action-map</FILE>
-amtk_action_map_add_action_entries_check_dups
-</SECTION>
-
-<SECTION>
-<FILE>amtk-factory</FILE>
-AmtkFactory
-AmtkFactoryFlags
-amtk_factory_new
-amtk_factory_new_with_default_application
-amtk_factory_get_application
-amtk_factory_get_default_flags
-amtk_factory_set_default_flags
-amtk_factory_create_menu_item
-amtk_factory_create_menu_item_full
-amtk_factory_create_check_menu_item
-amtk_factory_create_check_menu_item_full
-amtk_factory_create_tool_button
-amtk_factory_create_tool_button_full
-amtk_factory_create_menu_tool_button
-amtk_factory_create_menu_tool_button_full
-<SUBSECTION Standard>
-AMTK_FACTORY
-AMTK_FACTORY_CLASS
-AMTK_FACTORY_GET_CLASS
-AMTK_IS_FACTORY
-AMTK_IS_FACTORY_CLASS
-AMTK_TYPE_FACTORY
-AmtkFactoryClass
-AmtkFactoryPrivate
-amtk_factory_get_type
-AMTK_TYPE_FACTORY_FLAGS
-amtk_factory_flags_get_type
-</SECTION>
-
-<SECTION>
-<FILE>amtk-menu-item</FILE>
-amtk_menu_item_get_long_description
-amtk_menu_item_set_long_description
-amtk_menu_item_set_icon_name
-</SECTION>
-
-<SECTION>
-<FILE>amtk-menu-shell</FILE>
-AmtkMenuShell
-amtk_menu_shell_get_from_gtk_menu_shell
-amtk_menu_shell_get_menu_shell
-<SUBSECTION Standard>
-AMTK_IS_MENU_SHELL
-AMTK_IS_MENU_SHELL_CLASS
-AMTK_MENU_SHELL
-AMTK_MENU_SHELL_CLASS
-AMTK_MENU_SHELL_GET_CLASS
-AMTK_TYPE_MENU_SHELL
-AmtkMenuShellClass
-AmtkMenuShellPrivate
-amtk_menu_shell_get_type
-</SECTION>
-
-<SECTION>
-<FILE>amtk-utils</FILE>
-amtk_utils_recent_chooser_menu_get_item_uri
-amtk_utils_bind_g_action_to_gtk_action
-amtk_utils_create_gtk_action
-</SECTION>
-
 <INCLUDE>tepl/tepl.h</INCLUDE>
 
 <SECTION>
diff --git a/docs/reference/tepl-docs.xml.in b/docs/reference/tepl-docs.xml.in
index 2a4901a..68e835a 100644
--- a/docs/reference/tepl-docs.xml.in
+++ b/docs/reference/tepl-docs.xml.in
@@ -14,25 +14,6 @@
 
   <xi:include href="intro.xml"/>
 
-  <part id="amtk-api-reference">
-    <title>Amtk API Reference</title>
-
-    <chapter id="amtk">
-      <title>Actions, Menus and Toolbars Kit for GTK+</title>
-      <xi:include href="amtk-intro.xml"/>
-      <xi:include href="xml/amtk-init.xml"/>
-      <xi:include href="xml/amtk-application-window.xml"/>
-      <xi:include href="xml/amtk-action-info.xml"/>
-      <xi:include href="xml/amtk-action-info-store.xml"/>
-      <xi:include href="xml/amtk-action-info-central-store.xml"/>
-      <xi:include href="xml/amtk-action-map.xml"/>
-      <xi:include href="xml/amtk-factory.xml"/>
-      <xi:include href="xml/amtk-menu-item.xml"/>
-      <xi:include href="xml/amtk-menu-shell.xml"/>
-      <xi:include href="xml/amtk-utils.xml"/>
-    </chapter>
-  </part>
-
   <part id="tepl-api-reference">
     <title>Tepl API Reference</title>
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9725967..e1f5b2a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,14 +1,4 @@
 # List of source files containing translatable strings.
-amtk/amtk-action-info.c
-amtk/amtk-action-info-central-store.c
-amtk/amtk-action-info-store.c
-amtk/amtk-action-map.c
-amtk/amtk-application-window.c
-amtk/amtk-factory.c
-amtk/amtk-init.c
-amtk/amtk-menu-item.c
-amtk/amtk-menu-shell.c
-amtk/amtk-utils.c
 tepl/tepl-abstract-factory.c
 tepl/tepl-abstract-factory-vala.c
 tepl/tepl-application.c
diff --git a/tepl.pc.in b/tepl.pc.in
index d62157b..b7e7477 100644
--- a/tepl.pc.in
+++ b/tepl.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: @PACKAGE_NAME@
 Description: Text editor product line
 Version: @PACKAGE_VERSION@
-Requires: @TEPL_PACKAGE_REQUIRES@  amtk-@TEPL_API_VERSION@ >= @PACKAGE_VERSION@
+Requires: @TEPL_PACKAGE_REQUIRES@
 Requires.private: @TEPL_PACKAGE_REQUIRES_PRIVATE@
 Libs: -L${libdir} -ltepl-@TEPL_API_VERSION@
 Cflags: -I${includedir}/tepl-@TEPL_API_VERSION@
diff --git a/tepl/Makefile.am b/tepl/Makefile.am
index 1e69d83..ce7ca7e 100644
--- a/tepl/Makefile.am
+++ b/tepl/Makefile.am
@@ -124,9 +124,8 @@ lib_LTLIBRARIES = libtepl-@TEPL_API_VERSION@.la
 
 libtepl_@TEPL_API_VERSION@_la_SOURCES =
 
-libtepl_@TEPL_API_VERSION@_la_LIBADD =                         \
-       libtepl-core.la                                         \
-       $(top_builddir)/amtk/libamtk-@TEPL_API_VERSION@.la      \
+libtepl_@TEPL_API_VERSION@_la_LIBADD = \
+       libtepl-core.la                 \
        $(TEPL_DEP_LIBS)
 
 libtepl_@TEPL_API_VERSION@_la_LDFLAGS =                \
@@ -165,11 +164,7 @@ INTROSPECTION_SCANNER_ARGS =               \
        -I$(top_srcdir)                 \
        -I$(top_builddir)               \
        --c-include=tepl/tepl.h         \
-       --warn-all                      \
-       --include-uninstalled=$(top_builddir)/amtk/Amtk-@TEPL_API_VERSION@.gir
-
-INTROSPECTION_COMPILER_ARGS =                  \
-       --includedir=$(top_builddir)/amtk/
+       --warn-all
 
 Tepl_@TEPL_API_VERSION@_gir_NAMESPACE = Tepl
 Tepl_@TEPL_API_VERSION@_gir_VERSION = @TEPL_API_VERSION@
@@ -182,11 +177,8 @@ Tepl_@TEPL_API_VERSION@_gir_FILES =        \
        $(tepl_built_public_headers)    \
        $(tepl_built_public_c_files)
 
-# FIXME: list Amtk too?
-#Tepl_@TEPL_API_VERSION@_gir_INCLUDES = Gtk-3.0 GtkSource-4 Amtk-@TEPL_API_VERSION@
-#Tepl_@TEPL_API_VERSION@_gir_PACKAGES = gtk+-3.0 gtksourceview-4 amtk-@TEPL_API_VERSION@
-Tepl_@TEPL_API_VERSION@_gir_INCLUDES = Gtk-3.0 GtkSource-4
-Tepl_@TEPL_API_VERSION@_gir_PACKAGES = gtk+-3.0 gtksourceview-4
+Tepl_@TEPL_API_VERSION@_gir_INCLUDES = Gtk-3.0 GtkSource-4 Amtk-5
+Tepl_@TEPL_API_VERSION@_gir_PACKAGES = gtk+-3.0 gtksourceview-4 amtk-5
 Tepl_@TEPL_API_VERSION@_gir_EXPORT_PACKAGES = tepl-@TEPL_API_VERSION@
 
 girdir = $(datadir)/gir-1.0
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 625a20d..2c6ac85 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,17 +1,11 @@
 AM_CPPFLAGS =                  \
        -I$(top_srcdir)         \
        $(WARN_CFLAGS)          \
-       $(AMTK_DEP_CFLAGS)      \
        $(TEPL_DEP_CFLAGS)
 
 AM_LDFLAGS = $(WARN_LDFLAGS)
 
-# The order is important here: link Amtk after Tepl, since Tepl uses Amtk.
-# This is how Unix linkers work by default, see for example the documentation
-# of the --library option in the ld manpage.
 LDADD = $(top_builddir)/tepl/libtepl-core.la   \
-       $(top_builddir)/amtk/libamtk-core.la    \
-       $(AMTK_DEP_LIBS)                        \
        $(TEPL_DEP_LIBS)
 
 noinst_PROGRAMS = $(TEST_PROGS)
@@ -26,9 +20,6 @@ test_gutter_renderer_folds_SOURCES =          \
        tepl-gutter-renderer-folds-sub.h        \
        test-gutter-renderer-folds.c
 
-TEST_PROGS += test-menu
-test_menu_SOURCES = test-menu.c
-
 TEST_PROGS += test-tab
 test_tab_SOURCES = test-tab.c
 
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index f1eda97..c0389d5 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -13,36 +13,17 @@ VALGRIND_SUPPRESSIONS_FILES =                                       \
 AM_CPPFLAGS =                  \
        -I$(top_srcdir)         \
        $(WARN_CFLAGS)          \
-       $(AMTK_DEP_CFLAGS)      \
        $(TEPL_DEP_CFLAGS)
 
 AM_LDFLAGS = $(WARN_LDFLAGS)
 
-# The order is important here: link Amtk after Tepl, since Tepl uses Amtk.
-# This is how Unix linkers work by default, see for example the documentation
-# of the --library option in the ld manpage.
 LDADD = $(top_builddir)/tepl/libtepl-core.la   \
-       $(top_builddir)/amtk/libamtk-core.la    \
-       $(AMTK_DEP_LIBS)                        \
        $(TEPL_DEP_LIBS)
 
 noinst_PROGRAMS = $(UNIT_TEST_PROGS)
 TESTS = $(UNIT_TEST_PROGS)
 UNIT_TEST_PROGS =
 
-# Amtk
-
-UNIT_TEST_PROGS += amtk-test-action-info-store
-amtk_test_action_info_store_SOURCES = amtk/test-action-info-store.c
-
-UNIT_TEST_PROGS += amtk-test-action-map
-amtk_test_action_map_SOURCES = amtk/test-action-map.c
-
-UNIT_TEST_PROGS += amtk-test-utils
-amtk_test_utils_SOURCES = amtk/test-utils.c
-
-# Tepl
-
 UNIT_TEST_PROGS += test-buffer-input-stream
 test_buffer_input_stream_SOURCES = test-buffer-input-stream.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]