summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2002-07-14 03:16:41 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-07-14 03:16:41 +0000
commit812f7830849839e0bb562968cc9406f7821f1c19 (patch)
tree20e02998e87839c8a22ba6088b03838feb2277e0 /src/Makefile.am
parent826a0c4e10c2737ef888d3782eb84cf66747b911 (diff)
downloadmetacity-812f7830849839e0bb562968cc9406f7821f1c19.tar.gz
metacity-812f7830849839e0bb562968cc9406f7821f1c19.tar.bz2
adapt to virtual modifiers (meta_display_process_mapping_event): we need
2002-07-13 Havoc Pennington <hp@pobox.com> * src/keybindings.c: adapt to virtual modifiers (meta_display_process_mapping_event): we need to reload the binding tables now when the modmap changes. * src/prefs.c (update_binding): parse virtual modifiers, not plain modmask * src/common.h (MetaVirtualModifer): new enum * src/ui.c (meta_ui_parse_accelerator): use egg_accelerator_parse_virtual() * src/Makefile.am: add eggaccelerators.[hc] for the virtual accelerator parsing function
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 5f22dbb..97fed80 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,10 @@ SUBDIRS=wm-tester tools themes
INCLUDES=@METACITY_CFLAGS@ -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\"
+EGGFILES= \
+ eggaccelerators.c \
+ eggaccelerators.h
+
metacity_SOURCES= \
common.h \
core.c \
@@ -64,7 +68,8 @@ metacity_SOURCES= \
workspace.c \
workspace.h \
xprops.c \
- xprops.h
+ xprops.h \
+ $(EGGFILES)
metacity_theme_viewer_SOURCES= \
gradient.c \
@@ -118,4 +123,9 @@ CLEANFILES = inlinepixbufs.h
inlinepixbufs.h: $(IMAGES)
$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
-EXTRA_DIST=$(desktopfiles_DATA) $(IMAGES) $(schema_DATA)
+EXTRA_DIST=$(desktopfiles_DATA) $(IMAGES) $(schema_DATA) update-from-egg.sh
+
+EGGDIR=$(srcdir)/../../libegg/libegg
+
+regenerate-built-sources:
+ EGGFILES="$(EGGFILES)" EGGDIR="$(EGGDIR)" $(srcdir)/update-from-egg.sh