diff options
| author | Colin Walters <walters@verbum.org> | 2014-09-08 11:47:58 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2014-09-08 11:47:58 -0400 |
| commit | 1242704d68f6125f8b76850704e014b7dcd788ab (patch) | |
| tree | ce8a5d5da60a08c8c490338019156f6b1ad8d9f6 | |
| parent | afab8e2ad3f7ce6d40e658c791c0d312e7179c27 (diff) | |
| download | ostree-1242704d68f6125f8b76850704e014b7dcd788ab.tar.gz | |
build: Unify CPPFLAGS settings
The libostree core uses SYSCONFDIR now, so we should ensure it's used
consistently. Someone else was seeing SYSCONFDIR not being defined
while compiling with a newer automake version, which may process
CPPFLAGS more precisely.
| -rw-r--r-- | Makefile-libostree.am | 3 | ||||
| -rw-r--r-- | Makefile-ostree.am | 1 | ||||
| -rw-r--r-- | Makefile.am | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile-libostree.am b/Makefile-libostree.am index e7b141ae..fbe173dc 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -98,8 +98,7 @@ libostree_1_la_SOURCES += \ endif libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree \ - -DLOCALEDIR=\"$(datadir)/locale\" -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DGPGVPATH=\"$(GPGVPATH)\" $(OT_INTERNAL_GIO_UNIX_CFLAGS) $(OT_DEP_LZMA_CFLAGS) + $(OT_INTERNAL_GIO_UNIX_CFLAGS) $(OT_DEP_LZMA_CFLAGS) libostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions -export-symbols-regex '^ostree_' libostree_1_la_LIBADD = libotutil.la libostree-kernel-args.la $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_DEP_LZMA_LIBS) diff --git a/Makefile-ostree.am b/Makefile-ostree.am index 76df368b..47b06f1e 100644 --- a/Makefile-ostree.am +++ b/Makefile-ostree.am @@ -72,7 +72,6 @@ ostree_SOURCES += \ $(NULL) ostree_bin_shared_cflags = $(AM_CFLAGS) -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -I$(srcdir)/src/ostree \ - -DLOCALEDIR=\"$(datadir)/locale\" -DSYSCONFDIR=\"$(sysconfdir)\" \ $(NULL) ostree_bin_shared_ldadd = libotutil.la libostree-kernel-args.la libostree-1.la diff --git a/Makefile.am b/Makefile.am index df7771a5..614413ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,8 @@ include Makefile-decls.am ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} AM_CPPFLAGS += -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \ + -DLOCALEDIR=\"$(datadir)/locale\" -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DGPGVPATH=\"$(GPGVPATH)\" \ -DOSTREE_FEATURES='"$(OSTREE_FEATURES)"' \ -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36 \ -DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_40 -DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_40 |