[gnome-panel] clock: stop building separate noninst library

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 38202cb9f6c2c60240df49a0d245646b7cb9bb29
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Nov 30 14:45:11 2016 +0200

    clock: stop building separate noninst library

 applets/clock/Makefile.am |   20 ++------------------
 configure.ac              |    4 ----
 2 files changed, 2 insertions(+), 22 deletions(-)
---
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index e2f1315..6c91062 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -2,25 +2,9 @@ NULL =
 
 SUBDIRS = pixmaps
 
-noinst_LTLIBRARIES = libsystem-timezone.la
-
 clock_libdir = $(libdir)/gnome-panel/applets
 clock_lib_LTLIBRARIES = clock.la
 
-libsystem_timezone_la_CFLAGS = \
-       $(LIBGNOME_PANEL_CFLAGS) \
-       $(TZ_CFLAGS) \
-       $(WARN_CFLAGS) \
-       $(AM_CFLAGS) \
-       $(NULL)
-
-libsystem_timezone_la_SOURCES = \
-       system-timezone.c \
-       system-timezone.h \
-       $(NULL)
-
-libsystem_timezone_la_LIBADD = $(TZ_LIBS)
-
 if ENABLE_EDS
 CALENDAR_SOURCES = \
        calendar-client.c \
@@ -51,6 +35,8 @@ clock_la_SOURCES = \
        clock-utils.h \
        set-timezone.c \
        set-timezone.h \
+       system-timezone.c \
+       system-timezone.h \
        $(BUILT_SOURCES) \
        $(CALENDAR_SOURCES) \
        $(NULL)
@@ -65,7 +51,6 @@ clock_la_CPPFLAGS = \
 
 clock_la_CFLAGS = \
        $(LIBGNOME_PANEL_CFLAGS) \
-       $(TZ_CFLAGS) \
        $(CLOCK_CFLAGS) \
        $(CLOCK_EDS_CFLAGS) \
        $(WARN_CFLAGS) \
@@ -74,7 +59,6 @@ clock_la_CFLAGS = \
 
 clock_la_LIBADD = \
        $(top_builddir)/libgnome-panel/libgnome-panel.la \
-       libsystem-timezone.la \
        $(CLOCK_LIBS) \
        $(CLOCK_EDS_LIBS) \
        $(LIBGNOME_PANEL_LIBS) \
diff --git a/configure.ac b/configure.ac
index 530d621..57832f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,10 +172,6 @@ AC_SUBST(WNCKLET_LIBS)
 AC_CHECK_HEADERS(langinfo.h)
 AC_CHECK_FUNCS(nl_langinfo)
 
-PKG_CHECK_MODULES(TZ, gio-2.0 >= $GLIB_REQUIRED)
-AC_SUBST(TZ_CFLAGS)
-AC_SUBST(TZ_LIBS)
-
 PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED 
gio-2.0 >= $GLIB_REQUIRED librsvg-2.0 >= $LIBRSVG_REQUIRED gweather-3.0 >= $GWEATHER_REQUIRED 
gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED polkit-gobject-1 dconf >= $DCONF_REQUIRED)
 AC_SUBST(CLOCK_CFLAGS)
 AC_SUBST(CLOCK_LIBS)