diff -r 72755e49de4f -r 56dd34430f07 Makefile.am
--- a/Makefile.am	Wed Jun 21 08:42:01 2006 +0000
+++ b/Makefile.am	Wed Jun 21 11:10:00 2006 +0000
@@ -1,5 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir) -DLOCALEDIR=\""$(datadir)/locale"\"
-LDADD = $(top_builddir)/lemon/libemon.la
+
+SUBDIRS = po m4
 
 bin_PROGRAMS = glemon
 BUILT_SOURCES = guipixbufs.h
@@ -43,8 +44,8 @@
 	i18n.h \
 	gettext.h
 
-glemon_CXXFLAGS = $(GTK_CFLAGS)
-glemon_LDFLAGS = $(GTK_LIBS)
+glemon_CXXFLAGS = $(GTK_CFLAGS) $(LEMON_CFLAGS)
+glemon_LDFLAGS = $(GTK_LIBS) $(LEMON_LIBS)
 glemon_LDADD = $(LIBINTL)
 
 IMAGES = \
@@ -70,4 +71,66 @@
 	--raw --build-list $(VARIABLES) > guipixbufs.h ||  \
 	( rm -f guipixbufs.h && false )
 
-EXTRA_DIST = $(IMAGES) guipixbufs.h
+EXTRA_DIST = \
+	$(IMAGES) \
+	guipixbufs.h \
+	ABOUT-NLS
+
+MRPROPERFILES = \
+	Makefile.in \
+	configure \
+	config.h.in \
+	aclocal.m4 \
+	ABOUT-NLS \
+	m4/Makefile.in \
+	m4/lib-link.m4 \
+	m4/printf-posix.m4 \
+	m4/uintmax_t.m4 \
+	m4/signed.m4 \
+	m4/iconv.m4 \
+	m4/inttypes.m4 \
+	m4/longlong.m4 \
+	m4/glibc21.m4 \
+	m4/inttypes_h.m4 \
+	m4/codeset.m4 \
+	m4/longdouble.m4 \
+	m4/nls.m4 \
+	m4/intmax.m4 \
+	m4/lib-prefix.m4 \
+	m4/glibc2.m4 \
+	m4/xsize.m4 \
+	m4/lcmessage.m4 \
+	m4/lib-ld.m4 \
+	m4/ulonglong.m4 \
+	m4/wint_t.m4 \
+	m4/progtest.m4 \
+	m4/inttypes-pri.m4 \
+	m4/stdint_h.m4 \
+	m4/intdiv0.m4 \
+	m4/isc-posix.m4 \
+	m4/po.m4 \
+	m4/size_max.m4 \
+	m4/gettext.m4 \
+	m4/wchar_t.m4 \
+	po/Rules-quot \
+	po/en@quot.header \
+	po/insert-header.sin \
+	po/quot.sed \
+	po/en@boldquot.header \
+	po/boldquot.sed \
+	po/Makevars.template \
+	po/remove-potcdate.sin \
+	po/Makefile.in.in \
+	build-aux/mkinstalldirs \
+	build-aux/config.rpath \
+	build-aux/depcomp \
+	build-aux/missing \
+	build-aux/config.guess \
+	build-aux/config.sub \
+	build-aux/install-sh
+
+mrproper:
+	$(MAKE) $(AM_MAKEFLAGS) maintainer-clean
+	-rm -f $(MRPROPERFILES)
+
+.PHONY: mrproper