2 files changed, 55 insertions, 32 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 2f247c1..093a258 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,44 +1,67 @@
 
-if BUILD_CCPANEL
-ccpaneldir = $(libdir)/control-center-1/panels/
-ccpanel_LTLIBRARIES = libindicator-datetime.la
-endif
+SHARED_CFLAGS = \
+  -Wall \
+  -Wextra -Wno-missing-field-initializers \
+  -Werror \
+  $(SERVICE_CFLAGS) \
+  $(COVERAGE_CFLAGS) \
+  -DTIMEZONE_FILE="\"/etc/timezone\"" \
+  -DG_LOG_DOMAIN=\"Indicator-Datetime\"
+
+###
+###
+###
+
+noinst_LIBRARIES = libindicator-datetime-service.a
+
+libindicator_datetime_service_a_CFLAGS = \
+  $(SHARED_CFLAGS)
+
+libindicator_datetime_service_a_SOURCES = \
+  planner.c \
+  planner.h \
+  planner-eds.c \
+  planner-eds.h \
+  service.c \
+  service.h \
+  timezone.c \
+  timezone.h \
+  timezone-file.c \
+  timezone-file.h \
+  timezone-geoclue.c \
+  timezone-geoclue.h \
+  utils.c \
+  utils.h \
+  dbus-shared.h \
+  settings-shared.h
+
+###
+###
+###
 
 libexec_PROGRAMS = indicator-datetime-service
 
 indicator_datetime_service_SOURCES = \
-	planner.c \
-	planner.h \
-	planner-eds.c \
-	planner-eds.h \
-	service.c \
-	service.h \
-	main.c \
-	timezone.c \
-	timezone.h \
-	timezone-file.c \
-	timezone-file.h \
-	timezone-geoclue.c \
-	timezone-geoclue.h \
-	utils.c \
-	utils.h \
-	dbus-shared.h \
-	settings-shared.h
+  main.c
 
 indicator_datetime_service_CFLAGS = \
-	-Wall \
-        -Wextra -Wno-missing-field-initializers \
-	-Werror \
-	$(SERVICE_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	-DTIMEZONE_FILE="\"/etc/timezone\"" \
-	-DG_LOG_DOMAIN=\"Indicator-Datetime\"
+  $(SHARED_CFLAGS)
+
 indicator_datetime_service_LDADD = \
-	$(SERVICE_LIBS)
+  libindicator-datetime-service.a \
+  $(SERVICE_LIBS)
+
 indicator_datetime_service_LDFLAGS = \
-	$(COVERAGE_LDFLAGS)
+  $(COVERAGE_LDFLAGS)
+
+###
+###
+###
 
 if BUILD_CCPANEL
+ccpaneldir = $(libdir)/control-center-1/panels/
+ccpanel_LTLIBRARIES = libindicator-datetime.la
+
 libindicator_datetime_la_SOURCES =\
 	datetime-prefs.c \
 	datetime-prefs-locations.c \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6435d75..e204378 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -53,6 +53,6 @@ test_indicator_CPPFLAGS = $(TEST_CPPFLAGS) -DSCHEMA_DIR="\"$(top_builddir)/tests
 
 TESTS += test-utils
 check_PROGRAMS += test-utils
-test_utils_SOURCES = test-utils.cc $(top_srcdir)/src/utils.c
-test_utils_LDADD = $(TEST_LIBS)
+test_utils_SOURCES = test-utils.cc
+test_utils_LDADD = $(top_builddir)/src/libindicator-datetime-service.a $(TEST_LIBS)
 test_utils_CPPFLAGS = $(TEST_CPPFLAGS) -DSCHEMA_DIR="\"$(top_builddir)/tests/\""