=== modified file 'Makefile.am'
--- Makefile.am 2010-12-14 10:24:59 +0000
+++ Makefile.am 2011-01-31 01:20:58 +0000
@@ -11,8 +11,12 @@
autostartdir = $(sysconfdir)/xdg/autostart
sharedmimepackagedir = $(datadir)/mime/packages
mimeicondir = $(datadir)/icons/gnome/48x48/mimetypes
+pixmapdir = $(datadir)/pixmaps
basicdeskletsdir = ${installdir}
+# initialize this so we can add to it later
+nobase_dist_install_DATA =
+
include Makefile_gdesklets.am
include Makefile_python.am
include Makefile_basicdesklets.am
=== modified file 'Makefile_gdesklets.am'
--- Makefile_gdesklets.am 2011-01-30 20:21:36 +0000
+++ Makefile_gdesklets.am 2011-01-31 01:20:58 +0000
@@ -1,12 +1,14 @@
# Set the LDFLAGS for this section
AM_LDFLAGS = -module -avoid-version -as-needed
+# Libraries that get installed in these exact subdirectories
nobase_install_LTLIBRARIES = \
libdesklets/system/gtop.la \
utils/svg.la \
utils/tiling.la \
utils/x11.la
+# Scripts that get distributed and installed
dist_install_SCRIPTS = \
ctrlinfo \
gdesklets \
@@ -16,8 +18,10 @@
gdesklets-shell \
test-control.py
+# "System" scripts that get distributed but not installed
dist_noinst_SCRIPTS = autogen.sh
+# Man page
dist_man_MANS = doc/man/gdesklets.1
# The .desktop file
@@ -25,16 +29,34 @@
# The shared mime XML file
sharedmimepackage_in_files = data/gdesklets.xml.in
-EXTRA_DIST = \
- AUTHORS \
- COPYING \
- README \
- TODO \
- NEWS \
- contrib/bash/gdesklets \
- $(desktop_in_files) \
+# Other odds and ends that get distributed, but not installed
+# It's up to distro package maintainers to install these
+EXTRA_DIST = \
+ AUTHORS \
+ COPYING \
+ README \
+ TODO \
+ NEWS \
+ contrib/bash/gdesklets \
+ $(desktop_in_files) \
$(sharedmimepackage_in_files)
+# Docs and images that get distributed and installed to these specific
+# directories
+nobase_dist_install_DATA += \
+ doc/basic/gdesklets-doc.xml \
+ doc/basic/Images/desklet-context-menu.png \
+ doc/basic/Images/desklet-start-shell.png \
+ doc/basic/Images/gdesklets.png \
+ doc/basic/Images/open-command.png \
+ doc/basic/Images/preferences.png \
+ doc/basic/Images/profile.png \
+ doc/basic/Images/remote.png \
+ doc/basic/Images/shell.png \
+ data/about.png \
+ data/gdesklets.png
+
+# Additional files that get cleaned by distclean
# See http://www.gnu.org/software/hello/manual/automake/Clean.html
CLEANFILES = \
po/.intltool-merge-cache
@@ -49,8 +71,9 @@
@INTLTOOL_XML_RULE@
# And the mime icon
-mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png
+dist_mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png
+# Note, this gets installed in both $(pixmapdir) and $(installdir)
pixmap_DATA = data/gdesklets.png
libdesklets_system_gtop_la_CFLAGS = $(GLIBTOP_CFLAGS) \
=== modified file 'Makefile_python.am'
--- Makefile_python.am 2010-12-14 10:24:59 +0000
+++ Makefile_python.am 2011-01-31 01:20:58 +0000
@@ -1,4 +1,4 @@
-nobase_dist_install_DATA = \
+nobase_dist_install_DATA += \
Controls/__init__.py \
Controls/ArrayBuffer/__init__.py \
Controls/ArrayBuffer/IArrayBuffer.py \
@@ -48,21 +48,6 @@
config/DisplayConfigger.py \
config/StateSaver.py \
config/settings.py \
- data/about.png \
- data/calendar.png \
- data/gdesklets.desktop \
- data/gdesklets.png \
- data/gdesklets.xml \
- data/gnome-mime-application-x-gdesklets-display.png \
- doc/basic/gdesklets-doc.xml \
- doc/basic/Images/desklet-context-menu.png \
- doc/basic/Images/desklet-start-shell.png \
- doc/basic/Images/gdesklets.png \
- doc/basic/Images/open-command.png \
- doc/basic/Images/preferences.png \
- doc/basic/Images/profile.png \
- doc/basic/Images/remote.png \
- doc/basic/Images/shell.png \
display/__init__.py \
display/ContainerTarget.py \
display/DataTarget.py \
@@ -212,4 +197,3 @@
utils/typeconverter.py \
utils/vfs.py \
utils/xdr.py
-