From b8a2d13335598db30e21220b40748eecbff7510e Mon Sep 17 00:00:00 2001 From: Mika Laitio Date: Fri, 8 Oct 2010 03:04:16 +0300 Subject: [PATCH] updated test client app names to avoid conflicts --- configure.ac | 4 ++-- data/configs/Makefile.am | 2 +- data/configs/test_client.service.in | 2 -- data/configs/test_client2.service.in | 3 --- data/configs/test_ha_client.service.in | 2 ++ data/configs/test_ha_client2.service.in | 3 +++ src_test/Makefile.am | 10 +++++----- 7 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 data/configs/test_client.service.in delete mode 100644 data/configs/test_client2.service.in create mode 100644 data/configs/test_ha_client.service.in create mode 100644 data/configs/test_ha_client2.service.in diff --git a/configure.ac b/configure.ac index f193d20..6ea030e 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,6 @@ Makefile src/Makefile src_test/Makefile data/configs/Makefile -data/configs/test_client.service -data/configs/test_client2.service +data/configs/test_ha_client.service +data/configs/test_ha_client2.service ]) diff --git a/data/configs/Makefile.am b/data/configs/Makefile.am index 4623749..6c9cb49 100644 --- a/data/configs/Makefile.am +++ b/data/configs/Makefile.am @@ -1,5 +1,5 @@ configdir = $(sysconfdir)/plp/ha -config_in_files = test_client.service.in test_client2.service.in +config_in_files = test_ha_client.service.in test_ha_client2.service.in config_DATA = $(config_in_files:.service.in=.service) EXTRA_DIST = $(config_in_files) DISTCLEANFILES = $(config_DATA) Makefile.in diff --git a/data/configs/test_client.service.in b/data/configs/test_client.service.in deleted file mode 100644 index d85d75e..0000000 --- a/data/configs/test_client.service.in +++ /dev/null @@ -1,2 +0,0 @@ -config 'test_client' 'service' - option 'ExecStart' '@prefix@/bin/test_client' diff --git a/data/configs/test_client2.service.in b/data/configs/test_client2.service.in deleted file mode 100644 index bd4f582..0000000 --- a/data/configs/test_client2.service.in +++ /dev/null @@ -1,3 +0,0 @@ -config 'hello' 'service' - option 'ExecStart' '@prefix@/bin/test_client2' - diff --git a/data/configs/test_ha_client.service.in b/data/configs/test_ha_client.service.in new file mode 100644 index 0000000..a61ef8b --- /dev/null +++ b/data/configs/test_ha_client.service.in @@ -0,0 +1,2 @@ +config 'test_client' 'service' + option 'ExecStart' '@prefix@/bin/test_ha_client' diff --git a/data/configs/test_ha_client2.service.in b/data/configs/test_ha_client2.service.in new file mode 100644 index 0000000..bde01d8 --- /dev/null +++ b/data/configs/test_ha_client2.service.in @@ -0,0 +1,3 @@ +config 'hello' 'service' + option 'ExecStart' '@prefix@/bin/test_ha_client2' + diff --git a/src_test/Makefile.am b/src_test/Makefile.am index 6b54771..dbc6b2b 100644 --- a/src_test/Makefile.am +++ b/src_test/Makefile.am @@ -1,13 +1,13 @@ -noinst_PROGRAMS = test_ha test_client test_client2 +noinst_PROGRAMS = test_ha test_ha_client test_ha_client2 test_ha_SOURCES = test_ha.c test_ha_LDADD = $(SRC_LIBS) ../src/.libs/libplpha.a -test_client_SOURCES = test_client.c -test_client_LDADD = $(SRC_LIBS) ../src/.libs/libplpha.a +test_ha_client_SOURCES = test_client.c +test_ha_client_LDADD = $(SRC_LIBS) ../src/.libs/libplpha.a -test_client2_SOURCES = test_client.c -test_client2_LDADD = $(SRC_LIBS) ../src/.libs/libplpha.a +test_ha_client2_SOURCES = test_client.c +test_ha_client2_LDADD = $(SRC_LIBS) ../src/.libs/libplpha.a AM_CPPFLAGS = $(SRC_CFLAGS) -I../src -- 2.41.0