Merging upstream version 0.5.9.
[debian/lxpanel.git] / src / plugins / Makefile.am
index 34cc9ae..084dfc7 100644 (file)
@@ -11,12 +11,13 @@ SUBDIRS = $(DYNAMIC_PLUGINS)
 
 noinst_LIBRARIES = libbuiltin_plugins.a
 
-INCLUDES = \
+libbuiltin_plugins_a_CFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/plugins \
        -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+       -DPACKAGE_UI_DIR=\""$(datadir)/lxpanel/ui"\" \
        -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
        $(PACKAGE_CFLAGS) \
        $(G_CAST_CHECKS)
@@ -27,15 +28,17 @@ MENU_SOURCES = \
 endif
 
 PLUGINS_SOURCES = \
-       launchbar.c \
-       taskbar.c \
        dclock.c \
-       $(MENU_SOURCES) \
-       separator.c \
+       dirmenu.c \
+       image.c \
+       launchbar.c \
        pager.c \
+       separator.c \
        space.c \
+       taskbar.c \
+       tray.c \
        wincmd.c \
-       dirmenu.c
+       $(MENU_SOURCES)
 
 libbuiltin_plugins_a_SOURCES = \
        $(PLUGINS_SOURCES)