From b8ed1ea3a43d97dea2283d0086e5e86e35a588fd Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 6 Apr 2017 15:30:35 +1000 Subject: [PATCH] Remove autotools build system And thus drop the code to parse the top_srcdir from the arguments to the symbols-leak-test, not the env. Signed-off-by: Peter Hutterer --- Makefile.am | 6 -- configure.ac | 146 ---------------------------- data/Makefile.am | 2 - doc/Makefile.am | 36 ------- hwdb/Makefile.am | 9 -- semaphore/semaphore-build-script.sh | 3 - src/Makefile.am | 78 --------------- test/Makefile.am | 73 -------------- test/symbols-leak-test | 4 +- tools/Makefile.am | 32 ------ 10 files changed, 1 insertion(+), 388 deletions(-) delete mode 100644 Makefile.am delete mode 100644 configure.ac delete mode 100644 data/Makefile.am delete mode 100644 doc/Makefile.am delete mode 100644 hwdb/Makefile.am delete mode 100644 src/Makefile.am delete mode 100644 test/Makefile.am delete mode 100644 tools/Makefile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index fc998b7f..00000000 --- a/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -SUBDIRS = src doc test tools hwdb data - -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -valgrind: - (cd test; $(MAKE) valgrind) diff --git a/configure.ac b/configure.ac deleted file mode 100644 index e0d5d971..00000000 --- a/configure.ac +++ /dev/null @@ -1,146 +0,0 @@ -AC_PREREQ([2.64]) - -m4_define([libratbag_major_version], [0]) -m4_define([libratbag_minor_version], [6]) -m4_define([libratbag_micro_version], [0]) -m4_define([libratbag_version], - [libratbag_major_version.libratbag_minor_version.libratbag_micro_version]) - -AC_INIT([libratbag], - [libratbag_version], - [], - [libratbag], - []) - -AC_SUBST([LIBRATBAG_VERSION_MAJOR], [libratbag_major_version]) -AC_SUBST([LIBRATBAG_VERSION_MINOR], [libratbag_minor_version]) -AC_SUBST([LIBRATBAG_VERSION_MICRO], [libratbag_micro_version]) -AC_SUBST([LIBRATBAG_VERSION], [libratbag_version]) - -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_MACRO_DIR([m4]) - -AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz]) - -# Before making a release, the LIBRATBAG_LT_VERSION and LIBLUR_LT_VERSION -# strings should be modified. -# The strings are of the form C:R:A. -# a) If binary compatibility has been broken (eg removed or changed interfaces) -# change to C+1:0:0. -# b) If interfaces have been changed or added, but binary compatibility has -# been preserved, change to C+1:0:A+1 -# c) If the interface is the same as the previous version, change to C:R+1:A -LIBRATBAG_LT_VERSION=4:0:0 -LIBLUR_LT_VERSION=3:2:0 -AC_SUBST(LIBRATBAG_LT_VERSION) -AC_SUBST(LIBLUR_LT_VERSION) - -AM_SILENT_RULES([yes]) -AC_USE_SYSTEM_EXTENSIONS - -# Check for programs -AC_PROG_CC_C99 -AC_PROG_CXX # Only used by build C++ test -AC_PROG_GREP - -# Initialize libtool -LT_PREREQ([2.2]) -LT_INIT - -PKG_PROG_PKG_CONFIG() -PKG_CHECK_MODULES(LIBUDEV, [libudev]) -PKG_CHECK_MODULES(LIBEVDEV, [libevdev]) - -if test "x$GCC" = "xyes"; then - GCC_CXXFLAGS="-Wall -Wextra -Wno-unused-parameter -g -fvisibility=hidden" - GCC_CFLAGS="$GCC_CXXFLAGS -Wmissing-prototypes -Wstrict-prototypes" -fi -AC_SUBST(GCC_CFLAGS) -AC_SUBST(GCC_CXXFLAGS) - -AC_ARG_WITH(udev-base-dir, AS_HELP_STRING([--with-udev-base-dir=DIR], [where udev base directory is])) -if test -n "$with_udev_base_dir" ; then - UDEV_BASE_DIR="$with_udev_base_dir" -else - UDEV_BASE_DIR="$prefix/lib/udev" -fi -AC_SUBST(UDEV_BASE_DIR) - -AC_ARG_ENABLE([documentation], - [AC_HELP_STRING([--enable-documentation], - [Enable building the documentation (default=yes)])], - [build_documentation="$enableval"], - [build_documentation="yes"]) - -if test "x$build_documentation" = "xyes"; then - AC_PATH_PROG(DOXYGEN, doxygen) - if test "x$DOXYGEN" = "x"; then - AC_MSG_ERROR([Documentation build requested but doxygen not found. Install doxygen or disable the documentation using --disable-documentation]) - fi - - AC_MSG_CHECKING([for compatible doxygen version]) - doxygen_version=`$DOXYGEN --version` - AS_VERSION_COMPARE([$doxygen_version], [1.6.0], - [AC_MSG_RESULT([no]) - DOXYGEN=""], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([yes])]) - if test "x$DOXYGEN" = "x"; then - AC_MSG_ERROR([Doxygen $doxygen_version too old. Doxygen 1.6+ required for documentation build. Install required doxygen version or disable the documentation using --disable-documentation]) - fi - - AC_PATH_PROG(DOT, dot) - if test "x$DOT" = "x"; then - AC_MSG_ERROR([Documentation build requested but graphviz's dot not found. Install graphviz or disable the documentation using --disable-documentation]) - fi - - AC_MSG_CHECKING([for compatible dot version]) - dot_version=`$DOT -V 2>&1|$GREP -oP '(?<=version\W)@<:@0-9.@:>@*(?=\W(.*))'` - AS_VERSION_COMPARE([$dot_version], [2.26.0], - [AC_MSG_RESULT([no]) - DOT=""], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([yes])]) - if test "x$DOT" = "x"; then - AC_MSG_ERROR([Graphviz dot $dot_version too old. Graphviz 2.26+ required for documentation build. Install required graphviz version or disable the documentation using --disable-documentation]) - fi -fi - -AC_ARG_ENABLE(tests, - AS_HELP_STRING([--enable-tests], [Build the tests (default=yes)]), - [build_tests="$enableval"], - [build_tests="yes"]) - -if test "x$build_tests" = "xyes"; then - PKG_CHECK_MODULES(CHECK, [check >= 0.9.10]) - AC_PATH_PROG(VALGRIND, [valgrind]) -fi - -AC_DEFINE(BUILD_TESTS, [1], [Build the test suite]) -AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"]) -AM_CONDITIONAL(BUILD_TESTS, [test "x$build_tests" = "xyes"]) -AM_CONDITIONAL(BUILD_DOCS, [test "x$build_documentation" = "xyes"]) - -AC_CONFIG_FILES([Makefile - data/Makefile - doc/Makefile - doc/libratbag.doxygen - hwdb/Makefile - src/Makefile - src/libratbag.pc - src/libratbag-version.h - src/liblur.pc - test/Makefile - tools/Makefile], - [chmod +x test/symbols-leak-test]) - -AC_OUTPUT - -AC_MSG_RESULT([ - Prefix ${prefix} - udev base directory: ${UDEV_BASE_DIR} - - Build documentation ${build_documentation} - Build tests ${build_tests} - Tests use valgrind ${VALGRIND} - ]) diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index c6cd064b..00000000 --- a/data/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -libratbagdatadir = $(datadir)/libratbag -dist_libratbagdata_DATA = $(shell find $(top_srcdir)/data -name "*.svg" -printf "%P\n") diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 13e770ae..00000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -if BUILD_DOCS - -noinst_DATA = html/index.html - -header_files = \ - $(top_srcdir)/src/libratbag.h \ - $(top_srcdir)/README.md - -style_files = \ - style/header.html \ - style/footer.html \ - style/customdoxygen.css \ - style/bootstrap.css - -html/index.html: libratbag.doxygen $(header_files) $(diagram_files) $(style_files) - $(AM_V_GEN)$(DOXYGEN) $< - -clean-local: - $(AM_V_at)rm -rf html - -doc_src= $(shell find html -type f -printf "html/%P\n" 2>/dev/null) -EXTRA_DIST = $(builddir)/html/index.html \ - $(doc_src) \ - $(diagram_files) \ - $(header_files) \ - $(style_files) -endif - -# make sure doc was built before running dist -dist-hook: - @test -f $(distdir)/html/index.html || (\ - echo "******************************************************" && \ - echo "Couldn't find documentation files, refusing make dist." && \ - echo "Install doxygen to build documentation for tarball." && \ - echo "******************************************************" && \ - test ) diff --git a/hwdb/Makefile.am b/hwdb/Makefile.am deleted file mode 100644 index 5b1949a0..00000000 --- a/hwdb/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -udevrulesdir = $(UDEV_BASE_DIR)/rules.d -udevrules_DATA = 70-libratbag-mouse.rules - -hwdbdir = $(UDEV_BASE_DIR)/hwdb.d -hwdb_DATA = 70-libratbag-mouse.hwdb - -EXTRA_DIST = \ - $(udevrules_DATA) \ - $(hwdb_DATA) diff --git a/semaphore/semaphore-build-script.sh b/semaphore/semaphore-build-script.sh index f1e15877..524f2bd7 100644 --- a/semaphore/semaphore-build-script.sh +++ b/semaphore/semaphore-build-script.sh @@ -8,9 +8,6 @@ sudo apt-get update sudo apt-get install -y valgrind check libevdev-dev libudev-dev doxygen graphviz -autoreconf -ivf -./configure --prefix=$PWD/_build --with-udev-base-dir=$PWD/_build -DISTCHECK_CONFIGURE_FLAGS="--with-udev-base-dir=$PWD/_build" make distcheck # no meson on 14.04 sudo apt-get install -y python3-pip diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 116bc5d0..00000000 --- a/src/Makefile.am +++ /dev/null @@ -1,78 +0,0 @@ -lib_LTLIBRARIES = libratbag.la \ - liblur.la -noinst_LTLIBRARIES = libhidpp.la \ - libutil.la - -include_HEADERS = \ - libratbag.h \ - liblur.h - -libratbag_la_SOURCES = \ - driver-etekcity.c \ - driver-hidpp20.c \ - driver-hidpp10.c \ - driver-logitech-g300.c \ - driver-roccat.c \ - driver-gskill.c \ - driver-test.c \ - libratbag.c \ - libratbag.h \ - libratbag-hidraw.c \ - libratbag-hidraw.h \ - libratbag-private.h \ - libratbag-test.c \ - libratbag-test.h \ - usb-ids.h - -libratbag_la_LIBADD = \ - libhidpp.la \ - libutil.la \ - $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS) - -libratbag_la_CFLAGS = -I$(top_srcdir)/include \ - $(LIBUDEV_CFLAGS) \ - $(LIBEVDEV_CFLAGS) \ - $(GCC_CFLAGS) -EXTRA_libratbag_la_DEPENDENCIES = $(srcdir)/libratbag.sym - -libratbag_la_LDFLAGS = -version-info $(LIBRATBAG_LT_VERSION) -shared \ - -Wl,--version-script=$(srcdir)/libratbag.sym - -liblur_la_SOURCES = \ - liblur.c \ - liblur.h -liblur_la_LIBADD = \ - libhidpp.la \ - libutil.la -liblur_la_CFLAGS = \ - -I$(top_srcdir)/include \ - $(GCC_CFLAGS) -EXTRA_liblur_la_DEPENDENCIES = $(srcdir)/liblur.sym - -liblur_la_LDFLAGS = -version-info $(LIBLUR_LT_VERSION) -shared \ - -Wl,--version-script=$(srcdir)/liblur.sym - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libratbag.pc \ - liblur.pc - -AM_CFLAGS = $(GCC_CFLAGS) - -DISTCLEANFILES = libratbag-version.h -EXTRA_DIST = libratbag-version.h.in libratbag.sym liblur.sym - -# The hidpp libraries are static libraries only for in-tree tools. No API -# stability is guaranteed here. -libhidpp_la_SOURCES = \ - hidpp-generic.h \ - hidpp-generic.c \ - hidpp10.h \ - hidpp10.c \ - hidpp20.h \ - hidpp20.c \ - usb-ids.h -libhidpp_la_LDFLAGS = -lm -libutil_la_SOURCES = \ - libratbag-util.c \ - libratbag-util.h -libutil_la_LIBADD = $(LIBUDEV_LIBS) diff --git a/test/Makefile.am b/test/Makefile.am deleted file mode 100644 index 9d942063..00000000 --- a/test/Makefile.am +++ /dev/null @@ -1,73 +0,0 @@ -noinst_SCRIPTS = symbols-leak-test -TESTS = symbols-leak-test - -AM_TESTS_ENVIRONMENT=RATBAG_TEST=1; export RATBAG_TEST; TOP_SRCDIR="$(top_srcdir)"; export TOP_SRCDIR; - -if BUILD_TESTS -AM_CPPFLAGS = -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - $(CHECK_CFLAGS) \ - $(LIBEVDEV_CFLAGS) - -AM_CFLAGS = $(GCC_CFLAGS) -AM_CXXFLAGS = $(GCC_CXXFLAGS) - -TEST_LIBS = $(CHECK_LIBS) $(LIBEVDEV_LIBS) $(top_builddir)/src/libratbag.la - -run_tests = \ - test-context \ - test-device \ - test-iconv-helper - -build_tests = \ - test-build-cxx \ - test-build-linker \ - test-build-pedantic-c99 \ - test-build-std-gnuc90 - -noinst_PROGRAMS = $(build_tests) $(run_tests) -TESTS += $(run_tests) - -test_context_SOURCES = test-context.c -test_context_LDADD = $(TEST_LIBS) -test_context_LDFLAGS = -no-install - -test_device_SOURCES = test-device.c -test_device_LDADD = $(TEST_LIBS) -test_device_LDFLAGS = -no-install - -test_iconv_helper_SOURCES = test-iconv-helper.c -test_iconv_helper_LDADD = $(TEST_LIBS) $(top_builddir)/src/libutil.la -test_iconv_helper_LDFLAGS = -no-install - -# build-test only -test_build_pedantic_c99_SOURCES = build-pedantic.c -test_build_pedantic_c99_CFLAGS = -std=c99 -pedantic -Werror - -test_build_std_gnuc90_SOURCES = build-pedantic.c -test_build_std_gnuc90_CFLAGS = -std=gnu90 -Werror - -# test for linking with the minimal linker flags -test_build_linker_SOURCES = build-pedantic.c -test_build_linker_CFLAGS = -I$(top_srcdir)/src -test_build_linker_LDADD = $(top_builddir)/src/libratbag.la - -# test including from C++ -test_build_cxx_SOURCES = build-cxx.cc -test_build_cxx_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter $(AM_CXXFLAGS) - - -if HAVE_VALGRIND -VALGRIND_FLAGS=--leak-check=full \ - --quiet \ - --error-exitcode=3 \ - --suppressions=$(srcdir)/valgrind.suppressions - -valgrind: - $(MAKE) check-TESTS LOG_COMPILER="$(VALGRIND)" LOG_FLAGS="$(VALGRIND_FLAGS)" CK_FORK=no USING_VALGRIND=yes - -check: valgrind - -endif -endif -EXTRA_DIST=valgrind.suppressions symbols-leak-test diff --git a/test/symbols-leak-test b/test/symbols-leak-test index d5ab5d2a..f7628e58 100755 --- a/test/symbols-leak-test +++ b/test/symbols-leak-test @@ -2,9 +2,7 @@ ### simple check for exported symbols -if [ -z "$TOP_SRCDIR" ]; then - TOP_SRCDIR="$1" -fi +TOP_SRCDIR="$1" if [ -z "$TOP_SRCDIR" ]; then echo "usage: $0 path/to/top_srcdir" diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index 485a94e6..00000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -noinst_PROGRAMS = hidpp10-dump-page hidpp20-dump-page -bin_PROGRAMS = ratbag-command lur-command -noinst_LTLIBRARIES = libshared.la - -AM_CPPFLAGS = -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src # for libratbag-version.h - -libshared_la_SOURCES = \ - shared.c \ - shared.h -libshared_la_CFLAGS = $(LIBUDEV_LIBS) $(LIBEVDEV_CFLAGS) -libshared_la_LIBADD = $(LIBUDEV_CFLAGS) $(LIBEVDEV_LIBS) - -ratbag_command_SOURCES = ratbag-command.c -ratbag_command_LDADD = ../src/libratbag.la libshared.la $(LIBUDEV_LIBS) $(LIBEVDEV_LIBS) -ratbag_command_CFLAGS = $(LIBUDEV_CFLAGS) $(LIBEVDEV_CFLAGS) -dist_man1_MANS = ratbag-command.man - -hidpp10_dump_page_SOURCES = hidpp10-dump-page.c -hidpp10_dump_page_LDADD = ../src/libhidpp.la -hidpp10_dump_page_LDFLAGS = -no-install -hidpp10_dump_page_CFLAGS = -I$(top_srcdir)/src - -hidpp20_dump_page_SOURCES = hidpp20-dump-page.c -hidpp20_dump_page_LDADD = ../src/libhidpp.la -hidpp20_dump_page_LDFLAGS = -no-install -hidpp20_dump_page_CFLAGS = -I$(top_srcdir)/src - -lur_command_SOURCES = lur-command.c -lur_command_LDADD = ../src/liblur.la -lur_command_CFLAGS = -I$(top_srcdir)/src