summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2001-09-05 03:57:45 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-09-05 03:57:45 +0000
commit1c6c7350e175dabf2a28b4dfda74138b2b57d661 (patch)
tree6fe7d7c6179fdc668746ecc9029bca94b7b75d4b
parent2a0a5dfdf806f79bdcf8de4bf06109ef8c4eb849 (diff)
downloadmetacity-1c6c7350e175dabf2a28b4dfda74138b2b57d661.tar.gz
make test apps noinst
2001-09-04 Havoc Pennington <hp@pobox.com> * src/wm-tester/Makefile.am (noinst_PROGRAMS): make test apps noinst * src/metacity.desktop: for the capplet * src/Makefile.am: add .desktop file
-rw-r--r--ChangeLog9
-rw-r--r--src/Makefile.am6
-rw-r--r--src/metacity.desktop6
-rw-r--r--src/wm-tester/Makefile.am2
4 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e140454..fab90d4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-09-04 Havoc Pennington <hp@pobox.com>
+
+ * src/wm-tester/Makefile.am (noinst_PROGRAMS): make test apps
+ noinst
+
+ * src/metacity.desktop: for the capplet
+
+ * src/Makefile.am: add .desktop file
+
2001-09-01 Havoc Pennington <hp@pobox.com>
* src/errors.c: clean up the code, and replace GDK X error handler
diff --git a/src/Makefile.am b/src/Makefile.am
index eaf16f58..25d93073 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,3 +49,9 @@ metacity_SOURCES= \
bin_PROGRAMS=metacity
metacity_LDADD= @METACITY_LIBS@
+
+desktopfilesdir=$(datadir)/gnome/wm-properties
+desktopfiles_DATA=metacity.desktop
+
+EXTRA_DIST=$(desktopfiles_DATA)
+
diff --git a/src/metacity.desktop b/src/metacity.desktop
new file mode 100644
index 00000000..6daabe89
--- /dev/null
+++ b/src/metacity.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Metacity
+Exec=metacity
+
+[Window Manager]
+SessionManaged=true
diff --git a/src/wm-tester/Makefile.am b/src/wm-tester/Makefile.am
index 3cc8eeeb..e6ec2673 100644
--- a/src/wm-tester/Makefile.am
+++ b/src/wm-tester/Makefile.am
@@ -7,7 +7,7 @@ wm_tester_SOURCES= \
test_gravity_SOURCES= \
test-gravity.c
-bin_PROGRAMS=wm-tester test-gravity
+noinst_PROGRAMS=wm-tester test-gravity
wm_tester_LDADD= @METACITY_LIBS@
test_gravity_LDADD= @METACITY_LIBS@ \ No newline at end of file