1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
|
=== 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
=== modified file 'Makefile_gdesklets.am'
--- Makefile_gdesklets.am 2011-01-06 11:01:06 +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,38 +18,62 @@
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
-EXTRA_DIST = \
- AUTHORS \
- COPYING \
- README \
- TODO \
- NEWS \
- contrib/bash/gdesklets
-
+# The .desktop file
+desktop_in_files = data/gdesklets.desktop.in
+# The shared mime XML file
+sharedmimepackage_in_files = data/gdesklets.xml.in
+
+# 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
# The .desktop file
-desktop_in_files = data/gdesklets.desktop.in
-dist_desktop_DATA= $(desktop_in_files)
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
autostart_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
# The shared mime XML file
-sharedmimepackage_in_files = data/gdesklets.xml.in
-dist_sharedmimepackage_DATA = $(sharedmimepackage_in_files)
sharedmimepackage_DATA = $(sharedmimepackage_in_files:.xml.in=.xml)
@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
-
|