diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-05-04 15:22:19 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-05-04 15:22:19 +0200 |
| commit | f77fe62a5c25c43915dfb33a3c948dd282efd366 (patch) | |
| tree | 075672e044734a28a90901752a0b9a14e1afded0 | |
| parent | 6d18eb86becb48ce0360e6808d70a95752d8a0e3 (diff) | |
| download | libpam-x2go-f77fe62a5c25c43915dfb33a3c948dd282efd366.tar.gz libpam-x2go-f77fe62a5c25c43915dfb33a3c948dd282efd366.tar.bz2 libpam-x2go-f77fe62a5c25c43915dfb33a3c948dd282efd366.zip | |
Re-layout Makefile.am files.
| -rw-r--r-- | src/Makefile.am | 88 | ||||
| -rw-r--r-- | tests/Makefile.am | 88 |
2 files changed, 102 insertions, 74 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 49d5639..c33cf95 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,43 +3,55 @@ NULL = pamlibdir = $(PAMMODULEDIR) pamlib_LTLIBRARIES = pam_x2go.la -pam_x2go_la_SOURCES = \ - auth-check-path.c auth-check-path.h \ - pam-x2go.c \ - pam-x2go-children.c - -pam_x2go_la_LDFLAGS = \ - -no-undefined \ - -module \ - -avoid-version \ - $(COVERAGE_LDFLAGS) - -pam_x2go_la_CFLAGS = \ - -Wall -Werror \ - -DAUTH_CHECK="\"$(libexecdir)/x2go-auth-check\"" \ - $(COVERAGE_CFLAGS) - -pam_x2go_la_CPPFLAGS = \ - -I$(top_srcdir)/include \ - $(NULL) - -pam_x2go_la_LIBADD = \ - -lpam +pam_x2go_la_SOURCES = \ + auth-check-path.c auth-check-path.h \ + pam-x2go.c \ + pam-x2go-children.c \ + $(NULL) + +pam_x2go_la_LDFLAGS = \ + -no-undefined \ + -module \ + -avoid-version \ + $(COVERAGE_LDFLAGS) \ + $(NULL) + +pam_x2go_la_CFLAGS = \ + -Wall -Werror \ + -DAUTH_CHECK="\"$(libexecdir)/x2go-auth-check\"" \ + $(COVERAGE_CFLAGS) \ + $(NULL) + +pam_x2go_la_CPPFLAGS = \ + -I$(top_srcdir)/include \ + $(NULL) + +pam_x2go_la_LIBADD = \ + -lpam \ + $(NULL) pam_x2goincludedir = $(includedir)/security/ -pam_x2goinclude_HEADERS = \ - $(top_srcdir)/include/pam-x2go.h \ - $(NULL) - -libexec_PROGRAMS = \ - x2go-auth-check - -x2go_auth_check_SOURCES = \ - x2go-auth-check.c -x2go_auth_check_CFLAGS = \ - $(LIBSSH_CFLAGS) \ - $(COVERAGE_CFLAGS) -x2go_auth_check_LDADD = \ - $(LIBSSH_LIBS) -x2go_auth_check_LDFLAGS = \ - $(COVERAGE_LDFLAGS) +pam_x2goinclude_HEADERS = \ + $(top_srcdir)/include/pam-x2go.h \ + $(NULL) + +libexec_PROGRAMS = \ + x2go-auth-check \ + $(NULL) + +x2go_auth_check_SOURCES = \ + x2go-auth-check.c \ + $(NULL) + +x2go_auth_check_CFLAGS = \ + $(LIBSSH_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(NULL) + +x2go_auth_check_LDADD = \ + $(LIBSSH_LIBS) \ + $(NULL) + +x2go_auth_check_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + $(NULL) diff --git a/tests/Makefile.am b/tests/Makefile.am index ce629ea..a88cea8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,23 +1,31 @@ +NULL = + CLEANFILES = DISTCLEANFILES = EXTRA_DIST = -TESTS = \ - test-x2go-wrapper +TESTS = \ + test-x2go-wrapper \ + $(NULL) + +check_PROGRAMS = \ + test-x2go-auth \ + $(TESTS) \ + $(NULL) -check_PROGRAMS = \ - test-x2go-auth \ - $(TESTS) +AM_CPPFLAGS = $(GTEST_CPPFLAGS) \ + $(REMOTE_APPS_MANAGER_CFLAGS) \ + -I${top_srcdir}/src -Wall -Werror \ + $(NULL) -AM_CPPFLAGS = $(GTEST_CPPFLAGS) \ - $(REMOTE_APPS_MANAGER_CFLAGS) \ - -I${top_srcdir}/src -Wall -Werror -AM_CXXFLAGS = $(GTEST_CXXFLAGS) \ - $(REMOTE_APPS_MANAGER_CFLAGS) +AM_CXXFLAGS = $(GTEST_CXXFLAGS) \ + $(REMOTE_APPS_MANAGER_CFLAGS) \ + $(NULL) -AM_CFLAGS = \ - -Wall \ - -g +AM_CFLAGS = \ + -Wall \ + -g \ + $(NULL) ########################## # Google Test Test Suite # @@ -25,15 +33,18 @@ AM_CFLAGS = \ check_LIBRARIES = libgtest.a -nodist_libgtest_a_SOURCES = \ - $(GTEST_SOURCE)/src/gtest-all.cc \ - $(GTEST_SOURCE)/src/gtest_main.cc +nodist_libgtest_a_SOURCES = \ + $(GTEST_SOURCE)/src/gtest-all.cc \ + $(GTEST_SOURCE)/src/gtest_main.cc \ + $(NULL) -libgtest_a_CPPFLAGS = \ - $(GTEST_CPPFLAGS) -w \ - $(AM_CPPFLAGS) -libgtest_a_CXXFLAGS = \ - $(AM_CXXFLAGS) +libgtest_a_CPPFLAGS = \ + $(GTEST_CPPFLAGS) -w \ + $(AM_CPPFLAGS) \ + $(NULL) +libgtest_a_CXXFLAGS = \ + $(AM_CXXFLAGS) \ + $(NULL) ########################## # Wrapper @@ -41,27 +52,32 @@ libgtest_a_CXXFLAGS = \ test_x2go_wrapper: test-x2go-auth -test_x2go_wrapper_SOURCES = \ - mock_pam.c mock_pam.h \ - mock_guest.c mock_guest.h \ - test-x2go-wrapper.cc +test_x2go_wrapper_SOURCES = \ + mock_pam.c mock_pam.h \ + mock_guest.c mock_guest.h \ + test-x2go-wrapper.cc \ + $(NULL) -test_x2go_wrapper_LDADD = \ - $(top_builddir)/src/libssh.la \ - libgtest.a +test_x2go_wrapper_LDADD = \ + $(top_builddir)/src/libssh.la \ + libgtest.a \ + $(NULL) -test_x2go_wrapper_CXXFLAGS = \ - $(AM_CXXFLAGS) \ - -DAUTH_CHECK="\"$(abs_builddir)/test-x2go-auth\"" \ - -I${top_srcdir}/src +test_x2go_wrapper_CXXFLAGS = \ + $(AM_CXXFLAGS) \ + -DAUTH_CHECK="\"$(abs_builddir)/test-x2go-auth\"" \ + -I${top_srcdir}/src \ + $(NULL) -test_x2go_wrapper_LDFLAGS = \ - -pthread +test_x2go_wrapper_LDFLAGS = \ + -pthread \ + $(NULL) ########################## # Auth tool ########################## -test_x2go_auth_SOURCES = \ - test-x2go-auth.c +test_x2go_auth_SOURCES = \ + test-x2go-auth.c \ + $(NULL) |