Complete Makefile.am
authorJulien Lavergne <julien.lavergne@gmail.com>
Fri, 18 Jun 2010 19:12:13 +0000 (21:12 +0200)
committerJulien Lavergne <julien.lavergne@gmail.com>
Fri, 18 Jun 2010 19:12:13 +0000 (21:12 +0200)
data/Makefile.am
data/lxadmin.desktop.in [deleted file]
data/media/Makefile.am
data/ui/Makefile.am
data/ui/lxproxy/Makefile.am

index 119dce9..16fb119 100644 (file)
@@ -1,12 +1,17 @@
 NULL=
 
-SUBDIRS= \
-       ui \
-       $(NULL)
+SUBDIRS= ui media
 
 desktopdir=$(datadir)/applications
 desktop_in_files = \
-       lxadmin.desktop.in \
+       fontconfig.desktop.in \
+       keyboard-setup.desktop.in \
+       lxcc.desktop.in \
+       lxdmconf.desktop.in \
+       lxproxy.desktop.in \
+       openbox-keyconf.desktop.in \
+       screenshot.py.desktop.in \
+       services.py.desktop.in \
        $(NULL)
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
diff --git a/data/lxadmin.desktop.in b/data/lxadmin.desktop.in
deleted file mode 100644 (file)
index 55db04d..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=LXAdmin
-_GenericName=LXAdmin
-_Comment=LXAdmin Description
-Icon=LXAdmin
-Exec=lxadmin
-StartupNotify=true
-Categories=GTK;
index b21981d..47b58db 100644 (file)
@@ -2,5 +2,11 @@ NULL=
 
 SUBDIRS=
 
+media_iconsdir = $(datadir)/lxadmin/icons
+dist_media_iconsdir_DATA =             \
+       $(wildcard icons/*.svg)         \
+       $(wildcard icons/*.png)         \
+       $(NULL)
+
 EXTRA_DIST = \
        $(NULL)
index 685e0e9..46beb5d 100644 (file)
@@ -1,5 +1,7 @@
 NULL=
 
+SUBDIR= lxproxy
+
 # GtkBuilder UI definition files
 # uidir=$(datadir)/lxadmin/ui
 #ui_in_files= \
index 685e0e9..f10d09a 100644 (file)
@@ -1,21 +1,24 @@
 NULL=
 
 # GtkBuilder UI definition files
-# uidir=$(datadir)/lxadmin/ui
-#ui_in_files= \
-#      about.glade \
-#      $(NULL)
-# ui_DATA = $(ui_in_files:.glade=.ui)
-#
-# CLEANFILES = \
-#      $(ui_DATA) \
-#      $(NULL)
+uidir=$(datadir)/lxproxy/ui
+ui_in_files= \
+       AboutLxproxyDialog.ui \
+       LxproxyWindow.ui \
+       PreferencesLxproxyDialog.ui
+       $(NULL)
+
+ui_DATA = $(ui_in_files)
+
+CLEANFILES = \
+       $(ui_DATA) \
+       $(NULL)
 
 # Purge GtkBuilder UI files
 # %.ui: %.glade
 #      cp $< $@
 #      $(top_srcdir)/src/xml-purge $@
 
-EXTRA_DIST= \
-#      $(ui_DATA) \
-#      $(NULL)
+EXTRA_DIST= \
+       $(ui_DATA) \
+       $(NULL)