summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2011-11-07 17:51:54 +0000
committerBastien Nocera <hadess@hadess.net>2011-11-07 18:03:14 +0000
commit27c45abda3294239c7881a2ad878d9d1443f099a (patch)
tree3b6b78fc97ea5c555c39bc66c990c6dec5eed2ce /Makefile.am
parentacd1d3c6df9fee02d4e9961bd522a4def300242b (diff)
downloadgnome-control-center-27c45abda3294239c7881a2ad878d9d1443f099a.tar.gz
shell: Merge libgnome-control-center into main binary
This fixes problems with the CcEditableEntry type not being registered and causing the printers and user-accounts panels not to work. As we do not need to work on Windows, we do not need to split out the library.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 56049e7d1..4931964de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = po libgnome-control-center shell panels help
-DIST_SUBDIRS = po help shell panels libgnome-control-center
+SUBDIRS = po shell panels help
+DIST_SUBDIRS = po help shell panels
DISTCLEANFILES = \
gnome-doc-utils.make