From 220ba1cfc103ee4f932663fa1d2d956505ad4a94 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 10 Nov 2012 15:34:48 +0100 Subject: merge rules for pam_x2go and libx2gocore --- src/Makefile.am | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index d312011..ee5576e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,9 @@ pamlibdir = $(PAMMODULEDIR) pamlib_LTLIBRARIES = pam_x2go.la pam_x2go_la_SOURCES = \ - auth-check-path.c auth-check-path.h + auth-check-path.c auth-check-path.h \ + pam-x2go.c \ + pam-x2go-children.c pam_x2go_la_LDFLAGS = \ -no-undefined \ @@ -16,18 +18,7 @@ pam_x2go_la_CFLAGS = \ $(COVERAGE_CFLAGS) pam_x2go_la_LIBADD = \ - $(builddir)/libx2gocore.la - -libx2gocore_la_SOURCES = \ - pam-x2go.c \ - pam-x2go-children.c -libx2gocore_la_CFLAGS = \ - -Wall -Werror \ - $(COVERAGE_CFLAGS) -libx2gocore_la_LIBADD = \ -lpam -libx2gocore_la_LDFLAGS = \ - $(COVERAGE_LDFLAGS) libexec_PROGRAMS = \ x2go-auth-check -- cgit v1.2.3