diff -r 4f57efd63181 -r de8bef01b9ec Makefile.am
--- a/Makefile.am	Thu Mar 23 20:43:25 2006 +0000
+++ b/Makefile.am	Wed Apr 12 20:38:22 2006 +0000
@@ -1,12 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir) -DLOCALEDIR=\""$(datadir)/locale"\"
-LDADD = ../lemon/libemon.la
-
-ACLOCAL_AMFLAGS = -I m4
-
-EXTRA_DIST = \
-	build-aux/config.rpath
-
-SUBDIRS = po
+LDADD = $(top_builddir)/lemon/libemon.la
 
 bin_PROGRAMS = glemon
 BUILT_SOURCES = guipixbufs.h
@@ -51,7 +44,7 @@
 
 glemon_CXXFLAGS = $(GTK_CFLAGS)
 glemon_LDFLAGS = $(GTK_LIBS)
-#glemon_LDADD = $(LIBINTL)
+glemon_LDADD = $(LIBINTL)
 
 IMAGES = \
 	icons/addlink.png \
@@ -76,64 +69,4 @@
 	--raw --build-list $(VARIABLES) > guipixbufs.h ||  \
 	( rm -f guipixbufs.h && false )
 
-EXTRA_DIST += $(IMAGES) guipixbufs.h
-
-MRPROPERFILES = \
-	aclocal.m4 \
-	config.h.in \
-	config.h.in~ \
-	configure \
-	Makefile.in \
-	build-aux/config.guess \
-	build-aux/config.rpath \
-	build-aux/config.sub \
-	build-aux/depcomp \
-	build-aux/install-sh \
-	build-aux/ltmain.sh \
-	build-aux/missing \
-	build-aux/mkinstalldirs \
-	Makefile.in \
-	m4/intmax.m4 \
-	m4/lib-link.m4 \
-	m4/lib-prefix.m4 \
-	m4/printf-posix.m4 \
-	m4/xsize.m4 \
-	m4/glibc2.m4 \
-	m4/lib-ld.m4 \
-	m4/lcmessage.m4 \
-	m4/wint_t.m4 \
-	m4/ulonglong.m4 \
-	m4/inttypes-pri.m4 \
-	m4/progtest.m4 \
-	m4/uintmax_t.m4 \
-	m4/signed.m4 \
-	m4/stdint_h.m4 \
-	m4/intdiv0.m4 \
-	m4/iconv.m4 \
-	m4/po.m4 \
-	m4/isc-posix.m4 \
-	m4/longlong.m4 \
-	m4/inttypes.m4 \
-	m4/size_max.m4 \
-	m4/glibc21.m4 \
-	m4/gettext.m4 \
-	m4/codeset.m4 \
-	m4/inttypes_h.m4 \
-	m4/wchar_t.m4 \
-	m4/longdouble.m4 \
-	m4/nls.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
-
-mrproper:
-	$(MAKE) $(AM_MAKEFLAGS) maintainer-clean
-	-rm -f $(MRPROPERFILES)
-
-.PHONY: mrproper
+EXTRA_DIST = $(IMAGES) guipixbufs.h