1 files changed, 13 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index f4ee563f..391df3a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,6 @@ AM_CPPFLAGS = \
 -DLIBDIR=\""$(libdir)"\" \
 -DCAJA_DATADIR=\""$(datadir)/caja"\" \
 -DMATELOCALEDIR=\""$(datadir)/locale"\" \
- -DUIDIR=\""$(datadir)/caja/ui"\" \
 -DCAJA_PIXMAPDIR=\""$(datadir)/pixmaps/caja"\" \
 -DPREFIX=\""$(prefix)"\" \
 -DSYSCONFDIR=\""$(sysconfdir)"\" \
@@ -52,7 +51,15 @@ $(dbus_freedesktop_built_sources) : Makefile.am $(top_srcdir)/data/freedesktop-d
 $(top_srcdir)/data/freedesktop-dbus-interfaces.xml \
 $(NULL)
 
+caja-resources.c: $(srcdir)/../data/caja-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/caja-resources.gresource.xml)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name caja $<
+
+caja-resources.h: $(srcdir)/../data/caja-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/caja-resources.gresource.xml)
+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name caja $<
+
 BUILT_SOURCES = \
+ caja-resources.c \
+ caja-resources.h \
 caja-src-marshal.c \
 caja-src-marshal.h \
 $(dbus_freedesktop_built_sources) \
@@ -177,6 +184,11 @@ caja_file_management_properties_SOURCES = \
 caja-file-management-properties-main.c \
 $(NULL)
 
+nodist_caja_file_management_properties_SOURCES = \
+ caja-resources.c \
+ caja-resources.h \
+ $(NULL)
+
 caja_autorun_software_SOURCES = \
 caja-autorun-software.c \
 $(NULL)
@@ -203,18 +215,12 @@ endif
 
 uidir = $(datadir)/caja/ui
 
-ui_files = \
- caja-file-management-properties.ui \
- caja-bookmarks-window.ui \
- $(NULL)
-
 include $(top_srcdir)/gla11y.mk
 
 ui_DATA = \
 caja-shell-ui.xml \
 caja-navigation-window-ui.xml \
 caja-spatial-window-ui.xml \
- $(ui_files) \
 $(NULL)
 
 CLEANFILES = \
@@ -229,7 +235,6 @@ EXTRA_DIST = \
 $(ui_DATA) \
 check-caja \
 $(about_DATA) \
- ui-a11y.suppr \
 $(NULL)
 
 dist-hook: