[virt-tools-list] [PATCH virt-viewer 1/2] Add libvirt-viewer-util library an use it in tests

[Eduardo Lima (Etrunko)]

On 03/11/2016 11:40 AM, Fabiano Fidêncio wrote:
> On Wed, Mar 9, 2016 at 2:21 PM, Pavel Grunt <pgrunt at redhat.com> wrote:
>> ---
>>  src/Makefile.am | 28 +++++++++++++++++++++-------
>>  1 file changed, 21 insertions(+), 7 deletions(-)
>>
>> diff --git a/src/Makefile.am b/src/Makefile.am
>> index 2cd9001..aaa111d 100644
>> --- a/src/Makefile.am
>> +++ b/src/Makefile.am
>> @@ -3,7 +3,7 @@ LDADD =
>>  MAINTAINERCLEANFILES =
>>  bin_PROGRAMS =
>>
>> -noinst_LTLIBRARIES = libvirt-viewer.la
>> +noinst_LTLIBRARIES = libvirt-viewer-util.la libvirt-viewer.la
>>
>>  noinst_DATA =                                          \
>>         virt-viewer.xml                         \
>> @@ -45,10 +45,13 @@ CLEANFILES = \
>>         $(BUILT_SOURCES)                                \
>>         $(NULL)
>>
>> -libvirt_viewer_la_SOURCES =                                    \
>> -       $(BUILT_SOURCES)                                \
>> +libvirt_viewer_util_la_SOURCES =       \
>>         virt-viewer-util.h                              \
>>         virt-viewer-util.c                              \
>> +       $(NULL)
>> +
>> +libvirt_viewer_la_SOURCES =                                    \
>> +       $(BUILT_SOURCES)                                \
>>         virt-viewer-auth.h                              \
>>         virt-viewer-auth.c                              \
>>         virt-viewer-app.h                               \
>> @@ -120,6 +123,13 @@ COMMON_CFLAGS = \
>>         $(WARN_CFLAGS) \
>>         $(NULL)
>>
>> +libvirt_viewer_util_la_LIBADD = \
>> +       $(COMMON_LIBS) \
>> +       $(NULL)
>> +
>> +libvirt_viewer_util_la_CFLAGS = \
>> +       $(COMMON_CFLAGS)
>> +       $(NULL)
>>
>>  libvirt_viewer_la_LIBADD = \
>>         $(COMMON_LIBS) \
>> @@ -132,8 +142,6 @@ libvirt_viewer_la_CFLAGS = \
>>  check_PROGRAMS = test-version-compare test-monitor-mapping
>>  TESTS = $(check_PROGRAMS)
>>  test_version_compare_SOURCES =                         \
>> -       virt-viewer-util.c                              \
>> -       virt-viewer-util.h                              \
>>         test-version-compare.c                          \
>>         $(NULL)
>>  test_version_compare_LDFLAGS =                 \
>> @@ -148,10 +156,11 @@ test_version_compare_CFLAGS =                             \
>>         $(LIBXML2_CFLAGS)                                               \
>>         $(WARN_CFLAGS)                                                  \
>>         $(NULL)
>> +test_version_compare_LDADD =                           \
>> +       libvirt-viewer-util.la                                  \
>> +       $(NULL)
>>
>>  test_monitor_mapping_SOURCES =                         \
>> -       virt-viewer-util.c                                              \
>> -       virt-viewer-util.h                                              \
>>         test-monitor-mapping.c                                  \
>>         $(NULL)
>>  test_monitor_mapping_LDFLAGS =                         \
>> @@ -166,6 +175,9 @@ test_monitor_mapping_CFLAGS =                               \
>>         $(LIBXML2_CFLAGS)                                               \
>>         $(WARN_CFLAGS)                                                  \
>>         $(NULL)
>> +test_monitor_mapping_LDADD =                           \
>> +       libvirt-viewer-util.la                                  \
>> +       $(NULL)
>>
>>  if HAVE_LIBVIRT
>>  bin_PROGRAMS += virt-viewer
>> @@ -183,6 +195,7 @@ virt_viewer_CFLAGS =                                \
>>         $(LIBVIRT_CFLAGS)                       \
>>         $(NULL)
>>  virt_viewer_LDADD = \
>> +       libvirt-viewer-util.la  \
>>         libvirt-viewer.la \
>>         $(NULL)
>>  endif
>> @@ -205,6 +218,7 @@ remote_viewer_CFLAGS =                              \
>>         $(SPICE_CONTROLLER_CFLAGS)              \
>>         $(NULL)
>>  remote_viewer_LDADD = \
>> +       libvirt-viewer-util.la  \
>>         libvirt-viewer.la \
>>         $(NULL)
>>
>> --
>> 2.5.0
>>
>> _______________________________________________
>> virt-tools-list mailing list
>> virt-tools-list at redhat.com
>> https://www.redhat.com/mailman/listinfo/virt-tools-list
> 
> ACK from me.
> Eduardo, can you also take a look on this one?
> 
> Best Regards,
> --
> Fabiano Fidêncio
> 
> _______________________________________________
> virt-tools-list mailing list
> virt-tools-list at redhat.com
> https://www.redhat.com/mailman/listinfo/virt-tools-list
> 

Acked-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>

-- 
Eduardo de Barros Lima (Etrunko)
Software Engineer - RedHat
etrunko at redhat.com