1.1 --- a/gui/Makefile.am	Fri Apr 07 09:54:35 2006 +0000
     1.2 +++ b/gui/Makefile.am	Wed Apr 12 20:38:22 2006 +0000
     1.3 @@ -1,12 +1,5 @@
     1.4  AM_CPPFLAGS = -I$(top_srcdir) -DLOCALEDIR=\""$(datadir)/locale"\"
     1.5 -LDADD = ../lemon/libemon.la
     1.6 -
     1.7 -ACLOCAL_AMFLAGS = -I m4
     1.8 -
     1.9 -EXTRA_DIST = \
    1.10 -	build-aux/config.rpath
    1.11 -
    1.12 -SUBDIRS = po
    1.13 +LDADD = $(top_builddir)/lemon/libemon.la
    1.14  
    1.15  bin_PROGRAMS = glemon
    1.16  BUILT_SOURCES = guipixbufs.h
    1.17 @@ -51,7 +44,7 @@
    1.18  
    1.19  glemon_CXXFLAGS = $(GTK_CFLAGS)
    1.20  glemon_LDFLAGS = $(GTK_LIBS)
    1.21 -#glemon_LDADD = $(LIBINTL)
    1.22 +glemon_LDADD = $(LIBINTL)
    1.23  
    1.24  IMAGES = \
    1.25  	icons/addlink.png \
    1.26 @@ -76,64 +69,4 @@
    1.27  	--raw --build-list $(VARIABLES) > guipixbufs.h ||  \
    1.28  	( rm -f guipixbufs.h && false )
    1.29  
    1.30 -EXTRA_DIST += $(IMAGES) guipixbufs.h
    1.31 -
    1.32 -MRPROPERFILES = \
    1.33 -	aclocal.m4 \
    1.34 -	config.h.in \
    1.35 -	config.h.in~ \
    1.36 -	configure \
    1.37 -	Makefile.in \
    1.38 -	build-aux/config.guess \
    1.39 -	build-aux/config.rpath \
    1.40 -	build-aux/config.sub \
    1.41 -	build-aux/depcomp \
    1.42 -	build-aux/install-sh \
    1.43 -	build-aux/ltmain.sh \
    1.44 -	build-aux/missing \
    1.45 -	build-aux/mkinstalldirs \
    1.46 -	Makefile.in \
    1.47 -	m4/intmax.m4 \
    1.48 -	m4/lib-link.m4 \
    1.49 -	m4/lib-prefix.m4 \
    1.50 -	m4/printf-posix.m4 \
    1.51 -	m4/xsize.m4 \
    1.52 -	m4/glibc2.m4 \
    1.53 -	m4/lib-ld.m4 \
    1.54 -	m4/lcmessage.m4 \
    1.55 -	m4/wint_t.m4 \
    1.56 -	m4/ulonglong.m4 \
    1.57 -	m4/inttypes-pri.m4 \
    1.58 -	m4/progtest.m4 \
    1.59 -	m4/uintmax_t.m4 \
    1.60 -	m4/signed.m4 \
    1.61 -	m4/stdint_h.m4 \
    1.62 -	m4/intdiv0.m4 \
    1.63 -	m4/iconv.m4 \
    1.64 -	m4/po.m4 \
    1.65 -	m4/isc-posix.m4 \
    1.66 -	m4/longlong.m4 \
    1.67 -	m4/inttypes.m4 \
    1.68 -	m4/size_max.m4 \
    1.69 -	m4/glibc21.m4 \
    1.70 -	m4/gettext.m4 \
    1.71 -	m4/codeset.m4 \
    1.72 -	m4/inttypes_h.m4 \
    1.73 -	m4/wchar_t.m4 \
    1.74 -	m4/longdouble.m4 \
    1.75 -	m4/nls.m4 \
    1.76 -	po/Rules-quot \
    1.77 -	po/en@quot.header \
    1.78 -	po/insert-header.sin \
    1.79 -	po/quot.sed \
    1.80 -	po/en@boldquot.header \
    1.81 -	po/boldquot.sed \
    1.82 -	po/Makevars.template \
    1.83 -	po/remove-potcdate.sin \
    1.84 -	po/Makefile.in.in
    1.85 -
    1.86 -mrproper:
    1.87 -	$(MAKE) $(AM_MAKEFLAGS) maintainer-clean
    1.88 -	-rm -f $(MRPROPERFILES)
    1.89 -
    1.90 -.PHONY: mrproper
    1.91 +EXTRA_DIST = $(IMAGES) guipixbufs.h