From e072d9ba215208d47448a07359ca2fe6f840dab6 Mon Sep 17 00:00:00 2001 From: Petr Pavlu Date: Sun, 5 Mar 2017 21:00:13 +0000 Subject: [PATCH] Simplify test build files --- tests/CMakeLists.txt | 18 ++++++++++-------- tests/Makefile.am | 39 ++++++++------------------------------- 2 files changed, 18 insertions(+), 39 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a7bfefd..059974d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -22,18 +22,20 @@ add_compile_options(${SIGC_CFLAGS}) link_libraries(${SIGC_LDFLAGS} cppconsui) add_executable(button button.cpp main.cpp) -add_dependencies(check button) add_executable(colorpicker colorpicker.cpp main.cpp) -add_dependencies(check colorpicker) add_executable(label label.cpp main.cpp) -add_dependencies(check label) add_executable(submenu submenu.cpp main.cpp) -add_dependencies(check submenu) add_executable(textentry textentry.cpp main.cpp) -add_dependencies(check textentry) add_executable(textview textview.cpp main.cpp) -add_dependencies(check textview) add_executable(treeview treeview.cpp main.cpp) -add_dependencies(check treeview) add_executable(window window.cpp main.cpp) -add_dependencies(check window) + +add_dependencies(check + button + colorpicker + label + submenu + textentry + textview + treeview + window) diff --git a/tests/Makefile.am b/tests/Makefile.am index 0df4295..2016d4b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,37 +16,14 @@ LDADD = \ $(SIGC_LIBS) \ $(top_builddir)/cppconsui/libcppconsui.la -button_SOURCES = \ - button.cpp \ - main.cpp - -colorpicker_SOURCES = \ - colorpicker.cpp \ - main.cpp - -label_SOURCES = \ - label.cpp \ - main.cpp - -submenu_SOURCES = \ - submenu.cpp \ - main.cpp - -textentry_SOURCES = \ - textentry.cpp \ - main.cpp - -textview_SOURCES = \ - textview.cpp \ - main.cpp - -treeview_SOURCES = \ - treeview.cpp \ - main.cpp - -window_SOURCES = \ - window.cpp \ - main.cpp +button_SOURCES = button.cpp main.cpp +colorpicker_SOURCES = colorpicker.cpp main.cpp +label_SOURCES = label.cpp main.cpp +submenu_SOURCES = submenu.cpp main.cpp +textentry_SOURCES = textentry.cpp main.cpp +textview_SOURCES = textview.cpp main.cpp +treeview_SOURCES = treeview.cpp main.cpp +window_SOURCES = window.cpp main.cpp EXTRA_DIST = \ termex.py \ -- 2.11.4.GIT