Merge branch 'use-libfm'
[lxde/lxpanel.git] / data / Makefile.am
index 9399429..fd0ca31 100644 (file)
@@ -6,18 +6,30 @@ default_config_panel_DATA = \
        default/panels/panel
 default_config_paneldir = $(datadir)/lxpanel/profile/default/panels
 
        default/panels/panel
 default_config_paneldir = $(datadir)/lxpanel/profile/default/panels
 
+two_panels_config_DATA = \
+       two_panels/config
+two_panels_configdir = $(datadir)/lxpanel/profile/two_panels
+
+two_panels_config_panel_DATA = \
+       two_panels/panels/bottom \
+       two_panels/panels/top
+two_panels_config_paneldir = $(datadir)/lxpanel/profile/two_panels/panels
+
 uidir=$(datadir)/lxpanel/ui
 ui_in_files= \
 uidir=$(datadir)/lxpanel/ui
 ui_in_files= \
-       ui/panel-pref.glade
+       ui/panel-pref.glade \
+       ui/launchbar.glade \
+       ui/launchtaskbar.glade \
+       ui/netstatus.glade
+
 ui_DATA = $(ui_in_files:.glade=.ui)
 
 ui_DATA = $(ui_in_files:.glade=.ui)
 
-# Generate GtkBuilder UI files from Glade files
-%.ui: %.glade
-       cp $< $@
-       $(top_builddir)/src/xml-purge $@
+# Purge GtkBuilder UI files
+.glade.ui:
+       sed 's/<!--.*-->//' < $< | sed ':a;N;$$!ba;s/ *\n *</</g' > $@
 
 CLEANFILES = \
 
 CLEANFILES = \
-        $(ui_DATA)
+       $(ui_DATA)
 
 
 lxpanel_images_DATA = \
 
 
 lxpanel_images_DATA = \
@@ -36,7 +48,9 @@ lxpanel_images_DATA = \
        images/gnome-netstatus-txrx.png \
        images/gnome-netstatus-tx.png \
        images/background.png \
        images/gnome-netstatus-txrx.png \
        images/gnome-netstatus-tx.png \
        images/background.png \
-       images/volume.png \
+       images/volume-low.png \
+       images/volume-medium.png \
+       images/volume-high.png \
        images/mute.png \
        images/ns-bothrs.png \
        images/ns-connected.png \
        images/mute.png \
        images/ns-bothrs.png \
        images/ns-connected.png \
@@ -50,7 +64,10 @@ lxpanel_images_DATA = \
        images/numlock-on.png \
        images/numlock-off.png \
        images/scrllock-on.png \
        images/numlock-on.png \
        images/numlock-off.png \
        images/scrllock-on.png \
-       images/scrllock-off.png
+       images/scrllock-off.png \
+       images/window-manager.png \
+       images/clock.png \
+       images/cpufreq-icon.png
 
 
 lxpanel_imagesdir = $(datadir)/lxpanel/images
 
 
 lxpanel_imagesdir = $(datadir)/lxpanel/images
@@ -60,5 +77,6 @@ EXTRA_DIST = \
        $(lxpanel_DATA) \
        $(lxpanel_images_DATA) \
        $(ui_DATA) \
        $(lxpanel_DATA) \
        $(lxpanel_images_DATA) \
        $(ui_DATA) \
-       $(default_config_DATA)
-
+       $(ui_in_files) \
+       $(default_config_DATA) \
+       $(two_panels_config_DATA)