keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

automake: squash warnings re. subdir-objects

Browse Source 
During autoreconf, automake would emit many warnings regarding the
option 'subdir-objects' being disabled. We squash those warnings by
enabling the option.

We also fix Makefile.am so that it includes the patched libglnx Makefile
rather than the original one, which would cause libglnx output to be
placed in the literal dir './$(libglnx_srcpath)'.
This commit is contained in:
Jonathan Lebon 2015-09-11 09:33:46 -04:00
parent f994de3a93
commit 367229892f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -46,7 +46,7 @@ include $(INTROSPECTION_MAKEFILE)
GIRS = GIRS =
TYPELIBS = $(GIRS:.gir=.typelib) TYPELIBS = $(GIRS:.gir=.typelib)
include libglnx/Makefile-libglnx.am include libglnx/Makefile-libglnx.am.inc
noinst_LTLIBRARIES += libglnx.la noinst_LTLIBRARIES += libglnx.la
include Makefile-libpriv.am include Makefile-libpriv.am
include Makefile-lib.am include Makefile-lib.am

2
configure.ac
View File

@ -4,7 +4,7 @@ AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([buildutil]) AC_CONFIG_MACRO_DIR([buildutil])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([1.11 -Wno-portability foreign no-define tar-ustar no-dist-gzip dist-xz]) AM_INIT_AUTOMAKE([1.11 -Wno-portability foreign no-define tar-ustar no-dist-gzip dist-xz subdir-objects])
AM_MAINTAINER_MODE([enable]) AM_MAINTAINER_MODE([enable])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS