From da12b07241408d0a5042b000e63ee4a6b2b7564d Mon Sep 17 00:00:00 2001 From: orbea Date: Sun, 21 Mar 2021 13:24:23 -0700 Subject: [PATCH] build: Remove .libs from Makefile.am files. --- src/bindings/Makefile.am | 2 +- src/daemon/Makefile.am | 2 +- src/pam/Makefile.am | 2 +- src/tools/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am index caf388f..72e4a4c 100644 --- a/src/bindings/Makefile.am +++ b/src/bindings/Makefile.am @@ -5,7 +5,7 @@ lib_LTLIBRARIES = _libcgroup.la _libcgroup_la_SOURCES = libcgroup.c _libcgroup_la_LDFLAGS = $(shell python-config --ldflags) -module -avoid-version _libcgroup_la_CFLAGS = $(shell python-config --cflags) -_libcgroup_la_LIBADD = $(top_builddir)/src/.libs/libcgroup.la +_libcgroup_la_LIBADD = $(top_builddir)/src/libcgroup.la SWIG=swig diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index aa11333..7cba263 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -8,7 +8,7 @@ sbin_PROGRAMS = cgrulesengd 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/.libs/libcgroup.la -lrt +cgrulesengd_LDADD = $(top_builddir)/src/libcgroup.la -lrt cgrulesengd_LDFLAGS = -L$(top_builddir)/src/.libs endif diff --git a/src/pam/Makefile.am b/src/pam/Makefile.am index 5566cd7..bd5a91d 100644 --- a/src/pam/Makefile.am +++ b/src/pam/Makefile.am @@ -5,6 +5,6 @@ if WITH_PAM pamlib_LTLIBRARIES = pam_cgroup.la pam_cgroup_la_SOURCES = pam_cgroup.c pam_cgroup_la_LDFLAGS = -module -pam_cgroup_la_LIBADD = $(top_builddir)/src/.libs/libcgroup.la -lpam +pam_cgroup_la_LIBADD = $(top_builddir)/src/libcgroup.la -lpam endif diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index fd79285..ccf43ab 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -1,7 +1,7 @@ @CODE_COVERAGE_RULES@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include -LDADD = $(top_builddir)/src/.libs/libcgroup.la -lpthread +LDADD = $(top_builddir)/src/libcgroup.la -lpthread if WITH_TOOLS