From 383a4b7d760595b594086b04bb9d6abc6396b87c Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Thu, 10 Nov 2011 11:21:21 +0200 Subject: [PATCH] Install utilities under tests/ to bidir. --- Makefile.am | 4 ++-- configure.ac | 4 ++-- doc/Doxyfile | 2 +- {src => libsmack}/.gitignore | 0 {src => libsmack}/Makefile.am | 2 +- {src => libsmack}/libsmack.c | 0 {src => libsmack}/libsmack.h | 0 {src => libsmack}/libsmack.sym | 0 tests/Makefile.am | 11 ++++++----- 9 files changed, 12 insertions(+), 11 deletions(-) rename {src => libsmack}/.gitignore (100%) rename {src => libsmack}/Makefile.am (76%) rename {src => libsmack}/libsmack.c (100%) rename {src => libsmack}/libsmack.h (100%) rename {src => libsmack}/libsmack.sym (100%) diff --git a/Makefile.am b/Makefile.am index 6a32b95..621f0d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,9 +2,9 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} AM_MAKEFLAGS = --no-print-directory library_includedir=$(includedir) -library_include_HEADERS=src/libsmack.h +library_include_HEADERS=libsmack/libsmack.h -SUBDIRS = src tests doc +SUBDIRS = libsmack tests doc pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libsmack.pc diff --git a/configure.ac b/configure.ac index ef78d75..b465abf 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT([libsmack], [jarkko.sakkinen@intel.com], [libsmack], [https://meego.gitorious.org/meego-platform-security/libsmack]) -AC_CONFIG_SRCDIR([src/libsmack.c]) +AC_CONFIG_SRCDIR([libsmack/libsmack.c]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([-Wall -Werror dist-bzip2 foreign]) AC_USE_SYSTEM_EXTENSIONS @@ -23,6 +23,6 @@ fi AM_CONDITIONAL([ENABLE_DOXYGEN],[test ! -z "$DOXYGEN"], [Build API documentation.]) AC_SUBST([DOXYGEN], [$DOXYGEN]) -AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile doc/Makefile libsmack.pc]) +AC_CONFIG_FILES([Makefile libsmack/Makefile tests/Makefile doc/Makefile libsmack.pc]) AC_OUTPUT diff --git a/doc/Doxyfile b/doc/Doxyfile index 777011c..c234711 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -571,7 +571,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = ../$(SRCDIR)/src/libsmack.h +INPUT = ../$(SRCDIR)/libsmack/libsmack.h # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/src/.gitignore b/libsmack/.gitignore similarity index 100% rename from src/.gitignore rename to libsmack/.gitignore diff --git a/src/Makefile.am b/libsmack/Makefile.am similarity index 76% rename from src/Makefile.am rename to libsmack/Makefile.am index a42af4e..f25e528 100644 --- a/src/Makefile.am +++ b/libsmack/Makefile.am @@ -5,6 +5,6 @@ lib_LTLIBRARIES = libsmack.la libsmack_la_LDFLAGS = \ -version-info 1:0:0 \ - -Wl,--version-script=$(top_srcdir)/src/libsmack.sym + -Wl,--version-script=libsmack.sym libsmack_la_SOURCES = libsmack.c diff --git a/src/libsmack.c b/libsmack/libsmack.c similarity index 100% rename from src/libsmack.c rename to libsmack/libsmack.c diff --git a/src/libsmack.h b/libsmack/libsmack.h similarity index 100% rename from src/libsmack.h rename to libsmack/libsmack.h diff --git a/src/libsmack.sym b/libsmack/libsmack.sym similarity index 100% rename from src/libsmack.sym rename to libsmack/libsmack.sym diff --git a/tests/Makefile.am b/tests/Makefile.am index d8747c8..8190874 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,12 +1,13 @@ -AM_CPPFLAGS = -I../src +AM_CPPFLAGS = -I../libsmack -noinst_PROGRAMS = smackctl smackaccess smackself +instdir = ${bindir} +inst_PROGRAMS = smackctl smackaccess smackself smackctl_SOURCES = smackctl.c -smackctl_LDADD = -L$(top_builddir)/src/.libs -lsmack +smackctl_LDADD = ../libsmack/libsmack.la smackaccess_SOURCES = smackaccess.c -smackaccess_LDADD = -L$(top_builddir)/src/.libs -lsmack +smackaccess_LDADD = ../libsmack/libsmack.la smackself_SOURCES = smackself.c -smackself_LDADD = -L$(top_builddir)/src/.libs -lsmack +smackself_LDADD = ../libsmack/libsmack.la -- 2.7.4