Added patches from John and applied some fixes.

[lyx.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4f3dcb820bb646209e5228fd5ae91ac13f790a59..ea27b22facea23b0e5d3fad9da5327b029a9d404 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,8 +2,8 @@ AUTOMAKE_OPTIONS = foreign
 DISTCLEANFILES = *.orig *.rej *~ *.bak core textclass.lst packages.lst \
                lyxrc.defaults doc/LyXConfig.lyx
 pkgdata_SCRIPTS = configure configure.cmd
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-SUBDIRS    = reLyX
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in listerrors
+SUBDIRS = reLyX
 bin_SCRIPTS = listerrors
 
 BIND = bind/*.bind
@@ -11,23 +11,25 @@ CLIPART = clipart/*.eps
 DOCDIST = doc/LyXConfig.lyx*
 DOCINST = doc/*
 EXAMPLES = examples/*.lyx
-IMAGES = images/*.xpm images/*.xbm
+IMAGES = images/*.xpm
 KBD = kbd/*.kmap kbd/*.cdef
 LAYOUT = layouts/*.layout layouts/*.inc 
 LYXSCRIPTS = scripts/*
 TEMPL = templates/*.lyx
 TEXSUPPORT = tex/*.cls
+UI = ui/*.ui
 
 LIBINSTFILES = $(BIND) $(CLIPART) $(DOCINST) $(EXAMPLES) $(IMAGES) $(KBD) \
-       $(LAYOUT) $(TEMPL) $(TEXSUPPORT) $(LYXSCRIPTS)
+       $(LAYOUT) $(TEMPL) $(TEXSUPPORT) $(UI) $(LYXSCRIPTS)
 
 LIBDISTFILES = $(BIND) $(CLIPART) $(DOCDIST) $(EXAMPLES) $(IMAGES) $(KBD) \
-       $(LAYOUT) $(TEMPL) $(TEXSUPPORT) $(LYXSCRIPTS)
+       $(LAYOUT) $(TEMPL) $(UI) $(TEXSUPPORT) $(LYXSCRIPTS)
 
 pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx lyxrc.defaults \
                textclass.lst packages.lst external_templates
 
-LYXLIBDIRS = bind clipart doc examples images kbd layouts scripts templates tex
+LYXLIBDIRS = bind clipart doc examples images kbd layouts scripts \
+             templates tex ui
 
 EXTRA_DIST = CREDITS chkconfig.ltx configure.cmd lyxrc.example \
        external_templates $(LYXLIBDIRS) build-listerrors
@@ -57,4 +59,4 @@ dist-hook:
          echo "WARNING: Unable to get LyX Documentation from CVS!" ; true ; }
 
 listerrors: examples/Literate.lyx
-       ./build-listerrors
+       ${srcdir}/build-listerrors