build-sys: remove include-Makefile.am
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
50ea679509
commit
fb55280aa6
35
Makefile.am
35
Makefile.am
|
@ -1,4 +1,23 @@
|
|||
include $(top_srcdir)/config/include-Makefile.am
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-include config.h \
|
||||
-I$(top_srcdir)/include \
|
||||
-DLOCALEDIR=\"$(localedir)\"
|
||||
AM_CFLAGS = -fsigned-char $(WARN_CFLAGS)
|
||||
AM_LDFLAGS =
|
||||
|
||||
# Automake (at least up to 1.10) mishandles dist_man_MANS inside conditionals.
|
||||
# Unlike with other dist primaries, the files are not distributed if the
|
||||
# conditional is false.
|
||||
# Work the bug around until it is fixed:
|
||||
dist_noinst_DATA = $(dist_man_MANS)
|
||||
|
||||
# Paths to in-tree libraries (use ul_ prefix to avoid possible collisions)
|
||||
# Note that blkid.h and libmount.h are generated and stored in build dirs.
|
||||
#
|
||||
ul_libblkid_incdir = $(top_builddir)/libblkid/src
|
||||
ul_libmount_incdir = $(top_builddir)/libmount/src
|
||||
ul_libuuid_incdir = $(top_srcdir)/libuuid/src
|
||||
|
||||
pkgconfigdir = $(usrlib_execdir)/pkgconfig
|
||||
|
||||
|
@ -15,6 +34,7 @@ bin_PROGRAMS =
|
|||
sbin_PROGRAMS =
|
||||
dist_usrbin_exec_SCRIPTS =
|
||||
systemdsystemunit_DATA =
|
||||
ruman1_DATA =
|
||||
|
||||
INSTALL_EXEC_HOOKS =
|
||||
UNINSTALL_HOOKS =
|
||||
|
@ -24,11 +44,7 @@ CLEAN_LOCALS =
|
|||
EXTRA_DIST =
|
||||
CLEANFILES =
|
||||
|
||||
MAN_DIRS = man/ru
|
||||
|
||||
SUBDIRS = \
|
||||
$(MAN_DIRS) \
|
||||
po
|
||||
SUBDIRS = po
|
||||
|
||||
RCS_FIND_IGNORE = \( -name SCCS -o -name BitKeeper -o -name .svn -o \
|
||||
-name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o
|
||||
|
@ -61,7 +77,6 @@ include fdisks/Makemodule.am
|
|||
|
||||
include tests/Makemodule.am
|
||||
|
||||
|
||||
# Arrange so that .tarball-version appears only in the distribution
|
||||
# tarball, and never in a checked-out repository.
|
||||
dist-hook:
|
||||
|
@ -114,6 +129,12 @@ $(CHANGELOG_FILE):
|
|||
@ echo "--------------------------------------------" >> $(CHANGELOG_FILE)
|
||||
@ echo >> $(CHANGELOG_FILE)
|
||||
$(AM_V_GEN) git log --stat v$(PREVIOUS_VERSION)..HEAD >> $(CHANGELOG_FILE)
|
||||
#
|
||||
#
|
||||
# smatch scan -- smatch and cgcc are expected in $PATH
|
||||
#
|
||||
checksmatch:
|
||||
$(MAKE) CHECK="smatch --data=$(abs_top_srcdir)/tools/smatch-data" CC=cgcc
|
||||
|
||||
changelog: $(CHANGELOG_FILE)
|
||||
|
||||
|
|
|
@ -1,38 +0,0 @@
|
|||
AM_CPPFLAGS = \
|
||||
-include $(top_builddir)/config.h \
|
||||
-I$(top_srcdir)/include \
|
||||
-DLOCALEDIR=\"$(localedir)\"
|
||||
AM_CFLAGS = -fsigned-char $(WARN_CFLAGS)
|
||||
AM_LDFLAGS =
|
||||
|
||||
# Automake (at least up to 1.10) mishandles dist_man_MANS inside conditionals.
|
||||
# Unlike with other dist primaries, the files are not distributed if the
|
||||
# conditional is false.
|
||||
# Work the bug around until it is fixed:
|
||||
dist_noinst_DATA = $(dist_man_MANS)
|
||||
|
||||
# Paths to in-tree libraries (use ul_ prefix to avoid possible collisions)
|
||||
#
|
||||
# blkid
|
||||
ul_libblkid_srcdir = $(top_srcdir)/libblkid/src
|
||||
ul_libblkid_builddir = $(top_builddir)/libblkid/src
|
||||
ul_libblkid_incdir = $(ul_libblkid_builddir)
|
||||
ul_libblkid_la = libblkid.la
|
||||
|
||||
# uuid
|
||||
ul_libuuid_srcdir = $(top_srcdir)/libuuid/src
|
||||
ul_libuuid_builddir = $(top_builddir)/libuuid/src
|
||||
ul_libuuid_incdir = $(ul_libuuid_srcdir)
|
||||
ul_libuuid_la = libuuid.la
|
||||
|
||||
# mount
|
||||
ul_libmount_srcdir = $(top_srcdir)/libmount/src
|
||||
ul_libmount_builddir = $(top_builddir)/libmount/src
|
||||
ul_libmount_incdir = $(ul_libmount_builddir)
|
||||
ul_libmount_la = libmount.la
|
||||
|
||||
#
|
||||
# smatch scan -- smatch and cgcc are expected in $PATH
|
||||
#
|
||||
checksmatch:
|
||||
$(MAKE) CHECK="smatch --data=$(abs_top_srcdir)/tools/smatch-data" CC=cgcc
|
|
@ -1296,15 +1296,12 @@ AC_CONFIG_HEADERS(config.h)
|
|||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
libblkid/blkid.pc
|
||||
libblkid/docs/Makefile
|
||||
libblkid/docs/version.xml
|
||||
libblkid/src/blkid.h
|
||||
libmount/docs/Makefile
|
||||
libmount/docs/version.xml
|
||||
libmount/mount.pc
|
||||
libmount/src/libmount.h
|
||||
libuuid/uuid.pc
|
||||
man/ru/Makefile
|
||||
misc-utils/uuidd.service
|
||||
po/Makefile.in
|
||||
tests/commands.sh
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
include $(top_srcdir)/config/include-Makefile.am
|
||||
|
||||
if BUILD_DDATE
|
||||
ruman1_DATA = ddate.1
|
||||
EXTRA_DIST = $(ruman1_DATA)
|
||||
endif
|
Loading…
Reference in New Issue