From 5b58804662e795411c5223a737b36318fecdfc8d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 7 May 2018 16:39:56 +0200 Subject: Makefile.am: Re-layout format. --- Makefile.am | 12 +++-- data/Makefile.am | 18 ++++--- po/remote-logon-service.pot | 32 ++++++++++++ src/Makefile.am | 117 ++++++++++++++++++++++++++------------------ tests/Makefile.am | 88 +++++++++++++++++++-------------- 5 files changed, 170 insertions(+), 97 deletions(-) create mode 100644 po/remote-logon-service.pot diff --git a/Makefile.am b/Makefile.am index 9bcf14e..fe7fbd3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,11 @@ +NULL = -SUBDIRS = \ - src \ - data \ - po \ - tests +SUBDIRS = \ + src \ + data \ + po \ + tests \ + $(NULL) DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall diff --git a/data/Makefile.am b/data/Makefile.am index 3ba4d21..674076e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,5 +1,6 @@ -config_file_DATA = \ - remote-logon-service.conf +NULL = + +config_file_DATA = remote-logon-service.conf config_filedir = $(sysconfdir) dbus_servicesdir = $(DBUSSERVICEDIR) @@ -11,11 +12,12 @@ dbus_services_DATA = org.ArcticaProject.RemoteLogon.service %.conf: %.conf.in $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ -EXTRA_DIST = \ - org.ArcticaProject.RemoteLogon.service.in \ - remote-logon-service.conf.in +EXTRA_DIST = \ + org.ArcticaProject.RemoteLogon.service.in \ + remote-logon-service.conf.in \ + $(NULL) CLEANFILES = \ - org.ArcticaProject.RemoteLogon.service \ - remote-logon-service.conf - + org.ArcticaProject.RemoteLogon.service \ + remote-logon-service.conf \ + $(NULL) diff --git a/po/remote-logon-service.pot b/po/remote-logon-service.pot new file mode 100644 index 0000000..32ed576 --- /dev/null +++ b/po/remote-logon-service.pot @@ -0,0 +1,32 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-05-03 10:37+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../src/main.c:392 +msgid "" +"Configuration file for the remote logon service. Defaults to '/etc/remote-" +"logon-service.conf'." +msgstr "" + +#: ../src/main.c:392 +msgid "key_file" +msgstr "" + +#: ../src/main.c:417 +msgid "- Determine the remote servers that can be logged into" +msgstr "" diff --git a/src/Makefile.am b/src/Makefile.am index 823efdd..6270105 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,27 +1,36 @@ -pkglibexec_PROGRAMS = \ - remote-logon-service +NULL = -EXTRA_DIST = \ - org.ArcticaProject.RemoteLogon.xml +pkglibexec_PROGRAMS = \ + remote-logon-service \ + $(NULL) -noinst_LTLIBRARIES = \ - libservers.la \ - libgenerated.la +EXTRA_DIST = \ + org.ArcticaProject.RemoteLogon.xml \ + $(NULL) + +noinst_LTLIBRARIES = \ + libservers.la \ + libgenerated.la \ + $(NULL) ################################ # libgenerated ################################ -libgenerated_la_SOURCES = \ - remote-logon.c \ - remote-logon.h -libgenerated_la_CFLAGS = \ - $(SERVICE_CFLAGS) +libgenerated_la_SOURCES = \ + remote-logon.c \ + remote-logon.h \ + $(NULL) + +libgenerated_la_CFLAGS = \ + $(SERVICE_CFLAGS) \ + $(NULL) + $(libgenerated_la_SOURCES): org.ArcticaProject.RemoteLogon.xml - gdbus-codegen \ - --interface-prefix org.ArcticaProject \ - --generate-c remote-logon \ - $^ + gdbus-codegen \ + --interface-prefix org.ArcticaProject \ + --generate-c remote-logon \ + $^ BUILT_SOURCES = $(libgenerated_la_SOURCES) CLEANFILES = $(BUILT_SOURCES) @@ -30,40 +39,52 @@ CLEANFILES = $(BUILT_SOURCES) # libservers ################################ -libservers_la_SOURCES = \ - citrix-server.c \ - citrix-server.h \ - rdp-server.c \ - rdp-server.h \ - x2go-server.c \ - x2go-server.h \ - uccs-server.c \ - uccs-server.h \ - defines.h \ - server.c \ - server.h \ - crypt.c \ - crypt.h -libservers_la_CFLAGS = \ - -DUCCS_QUERY_TOOL="\"remote-logon-config-agent\"" \ - $(SERVICE_CFLAGS) \ - $(COVERAGE_CFLAGS) -libservers_la_LDFLAGS = \ - $(COVERAGE_LDFLAGS) $(GCRYPT_LIBS) -lm +libservers_la_SOURCES = \ + citrix-server.c \ + citrix-server.h \ + rdp-server.c \ + rdp-server.h \ + x2go-server.c \ + x2go-server.h \ + uccs-server.c \ + uccs-server.h \ + defines.h \ + server.c \ + server.h \ + crypt.c \ + crypt.h \ + $(NULL) + +libservers_la_CFLAGS = \ + -DUCCS_QUERY_TOOL="\"remote-logon-config-agent\"" \ + $(SERVICE_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(NULL) + +libservers_la_LDFLAGS = \ + $(COVERAGE_LDFLAGS) $(GCRYPT_LIBS) -lm \ + $(NULL) ################################ # remote-logon-service ################################ -remote_logon_service_CFLAGS = \ - -DDEFAULT_CONFIG_FILE="\"$(sysconfdir)/remote-logon-service.conf\"" \ - $(SERVICE_CFLAGS) \ - $(COVERAGE_CFLAGS) -remote_logon_service_LDADD = \ - $(builddir)/libservers.la \ - $(builddir)/libgenerated.la \ - $(SERVICE_LIBS) -remote_logon_service_LDFLAGS = \ - $(COVERAGE_LDFLAGS) -remote_logon_service_SOURCES = \ - main.c +remote_logon_service_CFLAGS = \ + -DDEFAULT_CONFIG_FILE="\"$(sysconfdir)/remote-logon-service.conf\"" \ + $(SERVICE_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(NULL) + +remote_logon_service_LDADD = \ + $(builddir)/libservers.la \ + $(builddir)/libgenerated.la \ + $(SERVICE_LIBS) \ + $(NULL) + +remote_logon_service_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + $(NULL) + +remote_logon_service_SOURCES = \ + main.c \ + $(NULL) diff --git a/tests/Makefile.am b/tests/Makefile.am index 7927598..a165072 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,12 +1,14 @@ +NULL = CLEANFILES = DISTCLEANFILES = EXTRA_DIST = check_PROGRAMS = -TESTS = \ - server-tester \ - dbus-interface-tester +TESTS = \ + server-tester \ + dbus-interface-tester \ + $(NULL) ##################################### # Server Test @@ -19,19 +21,25 @@ server-tester: server-test Makefile.am @echo gtester --verbose -k -o $(SERVER_XML_REPORT) $(abs_builddir)/server-test >> $@ @chmod +x $@ -CLEANFILES += \ - $(SERVER_XML_REPORT) \ - server-tester +CLEANFILES += \ + $(SERVER_XML_REPORT) \ + server-tester \ + $(NULL) -server_test_SOURCES = \ - server-test.c -server_test_CFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ - $(SERVICE_CFLAGS) -server_test_LDADD = \ - $(top_builddir)/src/libservers.la \ - $(SERVICE_LIBS) +server_test_SOURCES = \ + server-test.c \ + $(NULL) + +server_test_CFLAGS = \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ + $(SERVICE_CFLAGS) \ + $(NULL) + +server_test_LDADD = \ + $(top_builddir)/src/libservers.la \ + $(SERVICE_LIBS) \ + $(NULL) check_PROGRAMS += server-test @@ -45,30 +53,38 @@ dbus-interface-tester: dbus-interface uccs-config.conf slmock-config.conf Makefi @echo gtester --verbose -k -o $(DBUS_XML_REPORT) $(abs_builddir)/dbus-interface >> $@ @chmod +x $@ -CLEANFILES += \ - $(DBUS_XML_REPORT) \ - dbus-interface-tester \ - slmock-config.conf +CLEANFILES += \ + $(DBUS_XML_REPORT) \ + dbus-interface-tester \ + slmock-config.conf \ + $(NULL) -EXTRA_DIST += \ - null-config.conf \ - uccs-config.conf \ - slmock \ - slmock-config.conf.in +EXTRA_DIST += \ + null-config.conf \ + uccs-config.conf \ + slmock \ + slmock-config.conf.in \ + $(NULL) slmock-config.conf: slmock-config.conf.in sed -e "s|\@slmock\@|$(abs_srcdir)/slmock|" $< > $@ -dbus_interface_SOURCES = \ - dbus-interface.c -dbus_interface_CFLAGS = \ - -DREMOTE_LOGON_SERVICE="\"$(abs_top_builddir)/src/remote-logon-service\"" \ - -DUCCS_CONFIG_FILE="\"$(abs_srcdir)/uccs-config.conf\"" \ - -DSLMOCK_CONFIG_FILE="\"$(abs_builddir)/slmock-config.conf\"" \ - -DNULL_CONFIG_FILE="\"$(abs_srcdir)/null-config.conf\"" \ - $(SERVICE_CFLAGS) \ - $(TEST_CFLAGS) -dbus_interface_LDADD = \ - $(SERVICE_LIBS) \ - $(TEST_LIBS) + +dbus_interface_SOURCES = \ + dbus-interface.c \ + $(NULL) + +dbus_interface_CFLAGS = \ + -DREMOTE_LOGON_SERVICE="\"$(abs_top_builddir)/src/remote-logon-service\"" \ + -DUCCS_CONFIG_FILE="\"$(abs_srcdir)/uccs-config.conf\"" \ + -DSLMOCK_CONFIG_FILE="\"$(abs_builddir)/slmock-config.conf\"" \ + -DNULL_CONFIG_FILE="\"$(abs_srcdir)/null-config.conf\"" \ + $(SERVICE_CFLAGS) \ + $(TEST_CFLAGS) \ + $(NULL) + +dbus_interface_LDADD = \ + $(SERVICE_LIBS) \ + $(TEST_LIBS) \ + $(NULL) check_PROGRAMS += dbus-interface -- cgit v1.2.3