-bin_PROGRAMS = espeaktimed espeaktime-now.sh
-espeaktimed_SOURCES = daemon.c
-espeaktimed_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(MCE_CFLAGS) $(HAL_CFLAGS)
-espeaktimed_LDADD = $(GLIB_LIBS) $(DBUS_LIBS) $(MCE_LIBS) $(HAL_LIBS)
+bin_SCRIPTS = espeaktime-now.sh
+bin_PROGRAMS = espeaktimed
+espeaktimed_SOURCES = daemon.c config.c
+espeaktimed_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(MCE_CFLAGS) $(HAL_CFLAGS) $(GCONF_CFLAGS)
+espeaktimed_LDADD = $(GLIB_LIBS) $(DBUS_LIBS) $(MCE_LIBS) $(HAL_LIBS) $(GCONF_LIBS)
-# Nothing to do, we just want it installed.
-espeaktime-now.sh:
+libcpdir = $(libdir)/hildon-control-panel
+libcp_LTLIBRARIES = libespeaktime-cp.la
+libespeaktime_cp_la_SOURCES = applet.c config.c
+libespeaktime_cp_la_CFLAGS = $(HILDON_CFLAGS) $(GCONF_CLAGS) $(OSSO_CFLAGS)
+libespeaktime_cp_la_LDFLAGS = -module -avoid-version
+libespeaktime_cp_la_LIBADD = $(HILDON_LIBS) $(GCONF_LIBS)
+
+EXTRA_PROGRAMS = applet
+applet_SOURCES = applet.c config.c
+applet_CFLAGS = -DTEST $(HILDON_CFLAGS) $(GCONF_CFLAGS) $(OSSO_CFLAGS)
+applet_LDADD = $(HILDON_LIBS) $(GCONF_LIBS)