Merge branch 'master' of ssh://drop.maemo.org/git/livewp

[livewp] / applet / src / Makefile.am

diff --git a/applet/src/Makefile.am b/applet/src/Makefile.am
index 01c50b8..aeecf27 100644 (file)
--- a/applet/src/Makefile.am
+++ b/applet/src/Makefile.am
@@ -1,17 +1,23 @@
-#SOURCE_FILES = livewp-main.c \
-#             livewp-home-widget.c livewp-home-widget.h \
-#             livewp-astro.c livewp-astro.h \
-#             livewp-rules.c livewp-rules.h \
-#             livewp-settings.c livewp-settings.h livewp-common.h \
-#             livewp-config.c livewp-config.h \
-#             livewp-dbus.c livewp-dbus.h
-#
+SOURCE_FILES = livewp-main.c \
+              livewp-home-widget.c livewp-home-widget.h \
+              livewp-astro.c livewp-astro.h \
+              livewp-rules.c livewp-rules.h \
+              livewp-settings.c livewp-settings.h livewp-common.h \
+              livewp-config.c livewp-config.h \
+              livewp-dbus.c livewp-dbus.h \
+              livewp-actor.c livewp-actor.h \
+              livewp-exthemes.c livewp-exthemes.h \
+              livewp-scene.c livewp-scene.h \
+              livewp-conky.c livewp-conky.h
+
+
+
 #bin_PROGRAMS = livewp
-#livewp_SOURCES = $(SOURCE_FILES)
+livewp_SOURCES = $(SOURCE_FILES)
 #
-#livewp_CFLAGS = -Wall $(EXAMPLE_CFLAGS) $(OSSO_CFLAGS) -DAPPLICATION
+livewp_CFLAGS = -Wall $(MAEMO_CFLAGS) $(OSSO_CFLAGS) $(SQLITE_CFLAGS) -DAPPLICATION
 #
-#livewp_LDADD = $(EXAMPLE_LIBS) $(OSSO_LIBS)
+livewp_LDADD = $(MAEMO_LIBS) $(OSSO_LIBS) $(SQLITE_LIBS) -lgstinterfaces-0.10
 
 # We invent desktoplib_LTLIBRARIES instead of the normal lib_LTLIBRARIES,
 # so we can specify the non-standard installation directory.
@@ -19,24 +25,36 @@ desktoplib_LTLIBRARIES =  liblivewp-home-widget.la
 desktoplibdir = $(HILDON_DESKTOP_LIB_DIR)
 
 liblivewp_home_widget_la_SOURCES = livewp-home-widget.c livewp-home-widget.h \
-                                  livewp-astro.c livewp-astro.h \
-                                  livewp-rules.c livewp-rules.h \
-                                  livewp-settings.c livewp-settings.h livewp-common.h \
+                                  livewp-common.h \
                                   livewp-config.c livewp-config.h \
-                                  livewp-dbus.c livewp-dbus.h
-liblivewp_home_widget_la_LIBADD = $(EXAMPLE_LIBS) $(OSSO_LIBS) 
+                                  livewp-dbus.c livewp-dbus.h 
+liblivewp_home_widget_la_LIBADD = $(MAEMO_LIBS) $(OSSO_LIBS) 
 
-AM_CFLAGS = -Wall $(EXAMPLE_CFLAGS) $(OSSO_CFLAGS) 
+AM_CFLAGS = -Wall $(MAEMO_CFLAGS) $(OSSO_CFLAGS)  
 
 panellib_LTLIBRARIES =  liblivewp-panel-widget.la
 panellibdir = $(HILDON_PANEL_LIB_DIR)
 
 liblivewp_panel_widget_la_SOURCES = livewp-settings.c livewp-settings.h livewp-common.h \
-                                  livewp-config.c livewp-config.h \
+                                      livewp-config.c livewp-config.h \
+                                      livewp-exthemes.c livewp-exthemes.h \
                                   livewp-control-widget.c livewp-control-widget.h \
                                   livewp-dbus.c livewp-dbus.h
-liblivewp_panel_widget_la_LIBADD = $(EXAMPLE_LIBS) $(OSSO_LIBS) $(CONTROLPANEL_LIBS) 
+liblivewp_panel_widget_la_LIBADD = $(MAEMO_LIBS) $(OSSO_LIBS) $(CONTROLPANEL_LIBS)   
+
+liblivewp_panel_widget_la_CFLAGS = -Wall $(MAEMO_CFLAGS) $(OSSO_CFLAGS)  $(CONTROLPANEL_CFLAGS) -DCONTROLPANEL 
+
+FIFTEEN_SOURCE_FILES = fifteen.c livewp-common.h \
+                                       livewp-actor.c livewp-actor.h \
+                                       livewp-astro.c livewp-astro.h \
+                                       livewp-dbus.c livewp-dbus.h \
+                                       livewp-rules.c livewp-rules.h 
 
-liblivewp_panel_widget_la_CFLAGS = -Wall $(EXAMPLE_CFLAGS) $(OSSO_CFLAGS)  $(CONTROLPANEL_CFLAGS) -DCONTROLPANEL 
 
+bin_PROGRAMS = fifteen livewp
+fifteen_SOURCES = $(FIFTEEN_SOURCE_FILES)
+#
+fifteen_CFLAGS = -Wall $(MAEMO_CFLAGS) $(OSSO_CFLAGS) $(SQLITE_CFLAGS) -DAPPLICATION
+#
+fifteen_LDADD = $(MAEMO_LIBS) $(OSSO_LIBS) $(SQLITE_LIBS) -lgstinterfaces-0.10