summaryrefslogtreecommitdiff
path: root/src/tools/Makefile.am
diff options
context:
space:
mode:
authorAlex Duggan <aldug@astrolinux.com>2004-12-13 19:00:14 +0000
committerAlex Duggan <aldug@src.gnome.org>2004-12-13 19:00:14 +0000
commit8235fa831fb8376d594080dc5cf74cec20be8974 (patch)
treeb597d26bc7ede1beb6104ad934174a73700e2935 /src/tools/Makefile.am
parentd9f4f54b7d7382521b1ad4fa73e9683069f19c4d (diff)
downloadmetacity-8235fa831fb8376d594080dc5cf74cec20be8974.tar.gz
metacity-8235fa831fb8376d594080dc5cf74cec20be8974.tar.bz2
Remove deprecated capplet from GNOME 2.0
2004-12-07 Alex Duggan <aldug@astrolinux.com> * configure.in: * src/tools/Makefile.am: Remove deprecated capplet from GNOME 2.0 * src/tools/metacity-properties.c: * src/tools/metacity-properties.desktop.in: * src/tools/metacity-properties.glade: * src/tools/metacity-properties.png: Removed from cvs
Diffstat (limited to 'src/tools/Makefile.am')
-rw-r--r--src/tools/Makefile.am38
1 files changed, 3 insertions, 35 deletions
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 8c6c272..fe02c2c 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -4,9 +4,7 @@ icondir=$(pkgdatadir)/icons
icon_DATA=metacity-window-demo.png
INCLUDES=@METACITY_WINDOW_DEMO_CFLAGS@ @METACITY_MESSAGE_CFLAGS@ \
- @METACITY_PROPS_CFLAGS@ -DMETACITY_ICON_DIR=\"$(pkgdatadir)/icons\" \
- -DMETACITY_PROPS_GLADEDIR=\"$(pkgdatadir)/glade\" \
- -DMETACITY_PROPS_ICON_DIR=\"$(datadir)/pixmaps\" \
+ -DMETACITY_ICON_DIR=\"$(pkgdatadir)/icons\" \
-DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
metacity_message_SOURCES= \
@@ -21,34 +19,7 @@ metacity_mag_SOURCES= \
metacity_grayscale_SOURCES= \
metacity-grayscale.c
-metacity_properties_SOURCES= \
- metacity-properties.c
-
-metacity_properties_LDFLAGS = -export-dynamic
-
-uidir=$(pkgdatadir)/glade
-ui_DATA=metacity-properties.glade
-
-propicondir=$(datadir)/pixmaps
-propicon_DATA=metacity-properties.png
-
-METACITY_PROPERTIES_DESKTOP_IN=metacity-properties.desktop.in
-if BUILD_CONFIG_DIALOG
-METACITY_PROPERTIES_DESKTOP=metacity-properties.desktop
-else
-METACITY_PROPERTIES_DESKTOP=
-endif
-
-desktopdir=$(datadir)/control-center-2.0/capplets
-desktop_DATA=$(METACITY_PROPERTIES_DESKTOP)
-
-if BUILD_CONFIG_DIALOG
-CONFIG_DIALOG=metacity-properties
-else
-CONFIG_DIALOG=
-endif
-
-bin_PROGRAMS=metacity-message metacity-window-demo $(CONFIG_DIALOG)
+bin_PROGRAMS=metacity-message metacity-window-demo
## cheesy hacks I use, don't really have any business existing. ;-)
noinst_PROGRAMS=metacity-mag metacity-grayscale
@@ -57,9 +28,6 @@ metacity_message_LDADD= @METACITY_MESSAGE_LIBS@
metacity_window_demo_LDADD= @METACITY_WINDOW_DEMO_LIBS@
metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@
metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@
-if BUILD_CONFIG_DIALOG
-metacity_properties_LDADD= @METACITY_PROPS_LIBS@
-endif
-EXTRA_DIST=$(icon_DATA) $(ui_DATA) $(propicon_DATA) $(METACITY_PROPERTIES_DESKTOP_IN)
+EXTRA_DIST=$(icon_DATA)