summaryrefslogtreecommitdiff
path: root/capplets
diff options
context:
space:
mode:
Diffstat (limited to 'capplets')
-rw-r--r--capplets/Makefile.am8
-rw-r--r--capplets/about-me/Makefile.am5
2 files changed, 3 insertions, 10 deletions
diff --git a/capplets/Makefile.am b/capplets/Makefile.am
index 437e2e45..d1236522 100644
--- a/capplets/Makefile.am
+++ b/capplets/Makefile.am
@@ -8,7 +8,8 @@ SUBDIRS = \
keybindings \
mouse \
network \
- windows
+ windows \
+ about-me
DIST_SUBDIRS = \
common \
@@ -23,9 +24,4 @@ DIST_SUBDIRS = \
display \
about-me
-
-if BUILD_ABOUTME
-SUBDIRS += about-me
-endif
-
-include $(top_srcdir)/git.mk
diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am
index 6cd5e139..8249a385 100644
--- a/capplets/about-me/Makefile.am
+++ b/capplets/about-me/Makefile.am
@@ -28,10 +28,9 @@ marshal.h: fprintd-marshal.list
marshal.c: fprintd-marshal.list
@GLIB_GENMARSHAL@ --prefix=fprintd_marshal $< --body --header > $@
-if BUILD_ABOUTME
bin_PROGRAMS = mate-about-me
-mate_about_me_LDADD = $(MATECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS)
+mate_about_me_LDADD = $(MATECC_CAPPLETS_LIBS)
mate_about_me_LDFLAGS = -export-dynamic
@INTLTOOL_DESKTOP_RULE@
@@ -51,8 +50,6 @@ INCLUDES = \
-DMATECC_PIXMAP_DIR="\"$(pkgdatadir)/pixmaps\"" \
-DMATELOCALEDIR="\"$(datadir)/locale\""
-endif # BUILD_ABOUTME
-
CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(MARSHALFILES)
EXTRA_DIST = $(ui_files) fprintd-marshal.list