diff options
| author | Scott Balneaves <[email protected]> | 2012-12-14 08:56:06 -0600 |
|---|---|---|
| committer | Scott Balneaves <[email protected]> | 2012-12-14 08:56:06 -0600 |
| commit | 37b7b37e16c6f8067ff213b9436027b362c476a8 (patch) | |
| tree | 8748cb9f9fb57738a14422972f7af9c740cd7589 | |
| parent | 0eb2befbdb3b986cfe2a6ac3429951f463a10a7c (diff) | |
| download | mate-control-center-37b7b37e16c6f8067ff213b9436027b362c476a8.tar.bz2 mate-control-center-37b7b37e16c6f8067ff213b9436027b362c476a8.tar.xz | |
Remove about-me conditional compile as it has no dependencies
| -rw-r--r-- | capplets/Makefile.am | 8 | ||||
| -rw-r--r-- | capplets/about-me/Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 19 |
3 files changed, 3 insertions, 29 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 diff --git a/configure.ac b/configure.ac index e345f2ad..747275a7 100644 --- a/configure.ac +++ b/configure.ac @@ -240,25 +240,6 @@ AC_SUBST(LIBMATEKBDUI_CFLAGS) AC_SUBST(LIBMATEKBDUI_LIBS) dnl ============================================== -dnl About-me -dnl ============================================== - -AC_MSG_CHECKING([whether to enable About Me]) -AC_ARG_ENABLE([aboutme], - AC_HELP_STRING([--enable-aboutme], - [enable about-me capplet]),, - [enable_aboutme=no]) -AC_MSG_RESULT([$enable_aboutme]) - -dnl if test "x$enable_aboutme" = "xyes"; then -dnl PKG_CHECK_MODULES(LIBEBOOK, [libebook-1.2 >= 1.7.90], -dnl [AC_DEFINE([HAVE_LIBEBOOK], 1, -dnl [Define if evolution-data-server libebook-1.2 is available])]) -dnl fi - -AM_CONDITIONAL(BUILD_ABOUTME, test "x$enable_aboutme" = "xyes") - -dnl ============================================== dnl End: Check that we meet the dependencies dnl ============================================== |