Commit 06e84365 authored by Stef Walter's avatar Stef Walter
Browse files

Build fixes for 'make distcheck'

parent 9c20c4d6
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
*.gcda *.gcda
*.gir *.gir
*.pc *.pc
*.tar.gz
*.typelib *.typelib
.deps .deps
.cproject .cproject
......
...@@ -7,7 +7,9 @@ SUBDIRS = build po egg library ...@@ -7,7 +7,9 @@ SUBDIRS = build po egg library
DISTCHECK_CONFIGURE_FLAGS = \ DISTCHECK_CONFIGURE_FLAGS = \
--enable-debug=yes \ --enable-debug=yes \
--disable-coverage --disable-coverage \
--enable-strict \
--disable-silent-rules
dist-hook: dist-hook:
@if test -d "$(srcdir)/.git"; \ @if test -d "$(srcdir)/.git"; \
......
...@@ -6,10 +6,10 @@ VALGRIND_CONTRIB = \ ...@@ -6,10 +6,10 @@ VALGRIND_CONTRIB = \
$(NULL) $(NULL)
SUPPRESSIONS = \ SUPPRESSIONS = \
gcrypt.supp \ $(srcdir)/gcrypt.supp \
glib.supp \ $(srcdir)/glib.supp \
pthread.supp \ $(srcdir)/pthread.supp \
unknown.supp \ $(srcdir)/unknown.supp \
$(NULL) $(NULL)
valgrind-suppressions: $(SUPPRESSIONS) valgrind-suppressions: $(SUPPRESSIONS)
...@@ -19,4 +19,8 @@ EXTRA_DIST = \ ...@@ -19,4 +19,8 @@ EXTRA_DIST = \
valgrind \ valgrind \
$(SUPPRESSIONS) $(SUPPRESSIONS)
CLEANFILES = \
valgrind-suppressions \
$(NULL)
all-local: valgrind-suppressions all-local: valgrind-suppressions
AC_PREREQ(2.65) AC_PREREQ(2.63)
AC_CONFIG_MACRO_DIR([build/m4])
AC_INIT([libsecret],[0.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=libsecret]) AC_INIT([libsecret],[0.1],
[http://bugzilla.gnome.org/enter_bug.cgi?product=libsecret],
[libsecret])
dnl **************************************************************************** dnl ****************************************************************************
dnl Library package and libtool versioning dnl Library package and libtool versioning
...@@ -20,36 +21,43 @@ SECRET_CURRENT=0 ...@@ -20,36 +21,43 @@ SECRET_CURRENT=0
SECRET_REVISION=0 SECRET_REVISION=0
SECRET_AGE=0 SECRET_AGE=0
AC_CONFIG_SRCDIR([library/secret-value.c]) # -----------------------------------------------------------------------------
AC_CONFIG_HEADERS([config.h])
dnl Other initialization AC_CONFIG_MACRO_DIR([build/m4])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE([1.11 tar-ustar foreign -Wno-portability])
AM_SANITY_CHECK
AM_CONFIG_HEADER(config.h)
AC_CONFIG_SRCDIR([library/secret-value.c])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_MAINTAINER_MODE([enable]) AM_MAINTAINER_MODE([enable])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
LT_INIT
dnl Checks for programs. # -----------------------------------------------------------------------------
# Basic tools
AC_GNU_SOURCE
AC_ISC_POSIX
AC_PROG_CC AC_PROG_CC
AC_PROG_CPP AC_PROG_CPP
AM_PROG_CC_C_O AM_PROG_CC_C_O
AC_PROG_INSTALL
AC_CHECK_FUNCS(mlock) AC_PROG_LN_S
AC_PROG_MAKE_SET
# -------------------------------------------------------------------- AM_PROG_LIBTOOL
# intltool
#
IT_PROG_INTLTOOL([0.35.0]) IT_PROG_INTLTOOL([0.35.0])
GETTEXT_PACKAGE=libsecret AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
GETTEXT_PACKAGE=libsecret
AC_SUBST([GETTEXT_PACKAGE]) AC_SUBST([GETTEXT_PACKAGE])
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[The gettext domain name]) AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[The gettext domain name])
AM_GLIB_GNU_GETTEXT AM_GLIB_GNU_GETTEXT
# --------------------------------------------------------------------
# Checks for functions
AC_CHECK_FUNCS(mlock)
# -------------------------------------------------------------------- # --------------------------------------------------------------------
# GLib # GLib
#
PKG_CHECK_MODULES(GLIB, PKG_CHECK_MODULES(GLIB,
glib-2.0 >= 2.31.0 glib-2.0 >= 2.31.0
...@@ -63,7 +71,6 @@ AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) ...@@ -63,7 +71,6 @@ AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
# -------------------------------------------------------------------- # --------------------------------------------------------------------
# libgcrypt # libgcrypt
#
GCRYPT_VERSION=1.2.2 GCRYPT_VERSION=1.2.2
GCRYPT_LIBVER=1 GCRYPT_LIBVER=1
...@@ -99,15 +106,10 @@ AM_CONDITIONAL(WITH_GCRYPT, test "$enable_gcrypt" = "yes") ...@@ -99,15 +106,10 @@ AM_CONDITIONAL(WITH_GCRYPT, test "$enable_gcrypt" = "yes")
# -------------------------------------------------------------------- # --------------------------------------------------------------------
# Compilation options # Compilation options
#
AC_ARG_ENABLE(more-warnings, if test "$GCC" = "yes"; then
AS_HELP_STRING([--disable-more-warnings], [Inhibit compiler warnings]),
set_more_warnings=no)
if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
CFLAGS="$CFLAGS \ CFLAGS="$CFLAGS \
-Wall -Wstrict-prototypes -Wmissing-declarations \ -Wall -Wmissing-declarations \
-Wmissing-prototypes -Wnested-externs -Wpointer-arith \ -Wmissing-prototypes -Wnested-externs -Wpointer-arith \
-Wdeclaration-after-statement -Wformat=2 -Winit-self \ -Wdeclaration-after-statement -Wformat=2 -Winit-self \
-Waggregate-return -Wmissing-format-attribute" -Waggregate-return -Wmissing-format-attribute"
...@@ -140,7 +142,8 @@ if test "$enable_strict" = "yes"; then ...@@ -140,7 +142,8 @@ if test "$enable_strict" = "yes"; then
-DGDK_PIXBUF_DISABLE_DEPRECATED" -DGDK_PIXBUF_DISABLE_DEPRECATED"
INTROSPECTION_FLAGS="--warn-error" INTROSPECTION_FLAGS="--warn-error"
TEST_MODE="thorough" TEST_MODE="thorough"
else else
CFLAGS="$CFLAGS -Wno-error"
TEST_MODE="quick" TEST_MODE="quick"
INTROSPECTION_FLAGS="" INTROSPECTION_FLAGS=""
$enable_strict="no" $enable_strict="no"
...@@ -166,6 +169,7 @@ if test "$enable_debug" = "yes"; then ...@@ -166,6 +169,7 @@ if test "$enable_debug" = "yes"; then
CFLAGS="$CFLAGS -O0" CFLAGS="$CFLAGS -O0"
elif test "$enable_debug" = "no"; then elif test "$enable_debug" = "no"; then
debug_status="no" debug_status="no"
CFLAGS="$CFLAGS -O2"
AC_DEFINE_UNQUOTED(G_DISABLE_ASSERT, 1, [Disable glib assertions]) AC_DEFINE_UNQUOTED(G_DISABLE_ASSERT, 1, [Disable glib assertions])
else else
debug_status="default" debug_status="default"
......
...@@ -11,7 +11,9 @@ module_flags = \ ...@@ -11,7 +11,9 @@ module_flags = \
-export-symbols-regex '^secret_' -export-symbols-regex '^secret_'
INCLUDES = \ INCLUDES = \
-DSECRET_COMPILATION -I$(top_srcdir) \
-DSECRET_COMPILATION \
$(NULL)
lib_LTLIBRARIES = libsecret-@SECRET_MAJOR@.la lib_LTLIBRARIES = libsecret-@SECRET_MAJOR@.la
...@@ -51,6 +53,7 @@ PUBLIC_FILES = \ ...@@ -51,6 +53,7 @@ PUBLIC_FILES = \
$(NULL) $(NULL)
INTERNAL_FILES = \ INTERNAL_FILES = \
secret-private.h \
secret-session.c \ secret-session.c \
secret-util.c \ secret-util.c \
$(NULL) $(NULL)
...@@ -133,5 +136,14 @@ EXTRA_DIST = \ ...@@ -133,5 +136,14 @@ EXTRA_DIST = \
org.freedesktop.Secrets.xml \ org.freedesktop.Secrets.xml \
$(NULL) $(NULL)
CLEANFILES = \
$(pkgconfig_DATA) \
$(gir_DATA) \
$(typelibs_DATA) \
$(NULL)
DISTCLEANFILES = \
$(NULL)
check-memory: check-memory:
make -C tests check-memory make -C tests check-memory
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
INCLUDES = \ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/library \ -I$(top_srcdir)/library \
-DSRCDIR="\"@abs_srcdir@\"" \ -DSRCDIR="\"@abs_srcdir@\"" \
-DSECRET_COMPILATION \ -DSECRET_COMPILATION \
...@@ -43,6 +44,15 @@ check_PROGRAMS = \ ...@@ -43,6 +44,15 @@ check_PROGRAMS = \
noinst_PROGRAMS = \ noinst_PROGRAMS = \
$(NULL) $(NULL)
EXTRA_DIST = \
mock \
mock-service-delete.py \
mock-service-lock.py \
mock-service-normal.py \
mock-service-only-plain.py \
mock-service-prompt.py \
$(NULL)
test: $(TEST_PROGS) test: $(TEST_PROGS)
gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(TEST_PROGS) gtester --verbose -m $(TEST_MODE) --g-fatal-warnings $(TEST_PROGS)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment