From: Tom Hromatka Date: Fri, 28 Jan 2022 17:17:34 +0000 (-0700) Subject: automake: Don't go over 80-character lines X-Git-Tag: v3.0~243 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9acc538ff4f36a1d2639099311a2a1847ea8c094;p=thirdparty%2Flibcgroup.git automake: Don't go over 80-character lines Nonfunctional change to line wrap lines that were 80+ characters long. Signed-off-by: Tom Hromatka Reviewed-by: Kamalesh Babulal --- diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index f14fe4e3..8b2f4117 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -1,6 +1,6 @@ -man_MANS = cgclassify.1 cgconfig.conf.5 cgconfigparser.8 cgexec.1 cgred.conf.5 \ - cgrules.conf.5 cgrulesengd.8 cgcreate.1 cgset.1 cgget.1 \ - cgdelete.1 lssubsys.1 lscgroup.1 cgsnapshot.1 +man_MANS = cgclassify.1 cgconfig.conf.5 cgconfigparser.8 cgexec.1 \ + cgred.conf.5 cgrules.conf.5 cgrulesengd.8 cgcreate.1 cgset.1 \ + cgget.1 cgdelete.1 lssubsys.1 lscgroup.1 cgsnapshot.1 EXTRA_DIST = $(man_MANS) diff --git a/include/Makefile.am b/include/Makefile.am index 752a624c..32468357 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,2 +1,5 @@ # Using 'nobase_', we what groups.h in /usr/include/libcgroup/ directory -nobase_include_HEADERS = libcgroup.h libcgroup/error.h libcgroup/init.h libcgroup/groups.h libcgroup/tasks.h libcgroup/iterators.h libcgroup/config.h libcgroup/log.h +nobase_include_HEADERS = libcgroup.h libcgroup/error.h libcgroup/init.h \ + libcgroup/groups.h libcgroup/tasks.h \ + libcgroup/iterators.h libcgroup/config.h \ + libcgroup/log.h diff --git a/src/Makefile.am b/src/Makefile.am index 26e32238..811bce3c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,16 +15,20 @@ CLEANFILES = lex.c parse.c parse.h AM_CPPFLAGS = -I$(top_srcdir)/include +VERSION_NUMBER = $(LIBRARY_VERSION_MAJOR):$(LIBRARY_VERSION_MINOR):$(LIBRARY_VERSION_RELEASE) +TESTING_MAP_FILE = $(top_srcdir)/tests/gunit/libcgroup_unittest.map + lib_LTLIBRARIES = libcgroup.la -libcgroup_la_SOURCES = parse.h parse.y lex.l api.c config.c libcgroup-internal.h libcgroup.map wrapper.c log.c +libcgroup_la_SOURCES = parse.h parse.y lex.l api.c config.c \ + libcgroup-internal.h libcgroup.map wrapper.c log.c libcgroup_la_LIBADD = -lpthread $(CODE_COVERAGE_LIBS) libcgroup_la_CFLAGS = $(CODE_COVERAGE_CFLAGS) -DSTATIC=static libcgroup_la_LDFLAGS = -Wl,--version-script,$(srcdir)/libcgroup.map \ - -version-number $(LIBRARY_VERSION_MAJOR):$(LIBRARY_VERSION_MINOR):$(LIBRARY_VERSION_RELEASE) + -version-number $(VERSION_NUMBER) noinst_LTLIBRARIES = libcgroupfortesting.la libcgroupfortesting_la_SOURCES = $(libcgroup_la_SOURCES) libcgroupfortesting_la_LIBADD = -lpthread $(CODE_COVERAGE_LIBS) libcgroupfortesting_la_CFLAGS = $(CODE_COVERAGE_CFLAGS) -DSTATIC= -DUNIT_TEST -libcgroupfortesting_la_LDFLAGS = -Wl,--version-script,$(top_srcdir)/tests/gunit/libcgroup_unittest.map \ - -version-number $(LIBRARY_VERSION_MAJOR):$(LIBRARY_VERSION_MINOR):$(LIBRARY_VERSION_RELEASE) +libcgroupfortesting_la_LDFLAGS = -Wl,--version-script,$(TESTING_MAP_FILE) \ + -version-number $(VERSION_NUMBER) diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 4f5ca609..0e349751 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -5,7 +5,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include if WITH_DAEMON sbin_PROGRAMS = cgrulesengd -cgrulesengd_SOURCES = cgrulesengd.c cgrulesengd.h ../tools/tools-common.h ../tools/tools-common.c +cgrulesengd_SOURCES = cgrulesengd.c cgrulesengd.h ../tools/tools-common.h \ + ../tools/tools-common.c cgrulesengd_LIBS = $(CODE_COVERAGE_LIBS) cgrulesengd_CFLAGS = $(CODE_COVERAGE_CFLAGS) cgrulesengd_LDADD = $(top_builddir)/src/libcgroup.la -lrt diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index e80d7117..69806a3f 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -5,8 +5,8 @@ LDADD = $(top_builddir)/src/libcgroup.la -lpthread if WITH_TOOLS -bin_PROGRAMS = cgexec cgclassify cgcreate cgset cgget cgdelete lssubsys\ - lscgroup cgsnapshot +bin_PROGRAMS = cgexec cgclassify cgcreate cgset cgget cgdelete lssubsys \ + lscgroup cgsnapshot sbin_PROGRAMS = cgconfigparser