X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=510eae7574d4078008bd74bc27494b2ce2654e2e;hb=6c2e78e12855d8661eb289ded3dc8722748863b8;hp=32459d5493091f38ad4b499b40c318525bd449e7;hpb=71298cca7fa46d6d3cae12d9954dd05b5fd40c71;p=lyx.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 32459d5493..510eae7574 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,11 +1,10 @@
 include $(top_srcdir)/config/common.am
 
-DISTCLEANFILES += textclass.lst packages.lst lyxrc.defaults
+DISTCLEANFILES += texput.log textclass.lst packages.lst lyxrc.defaults
 
-SUBDIRS = doc reLyX
+SUBDIRS = doc lyx2lyx
 
 EXTRA_DIST = \
-	configure.m4 \
 	chkconfig.ltx
 
 CHMOD = chmod
@@ -13,9 +12,9 @@ CHMOD = chmod
 # We cannot use dist_pkgdata_SCRIPTS for configure, since a possible
 # version-suffix would get appended to the names. So we use dist_pkgdata_DATA
 # and chmod manually in install-data-hook.
-dist_pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx configure \
+dist_pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx configure.py \
 	       lyxrc.defaults textclass.lst packages.lst external_templates \
-	       encodings languages symbols
+	       encodings languages symbols syntax.default
 
 binddir = $(pkgdatadir)/bind
 dist_bind_DATA = \
@@ -57,9 +56,17 @@ dist_examples_DATA = \
 	examples/currency.lyx \
 	examples/cv.lyx \
 	examples/da_splash.lyx \
+	examples/de_ItemizeBullets.lyx \
+	examples/de_Lebenslauf.lyx \
+	examples/de_Minipage.lyx \
+	examples/de_TableExamples.lyx \
+	examples/de_Waehrungen.lyx \
 	examples/de_beispiel_gelyxt.lyx \
 	examples/de_beispiel_roh.lyx \
+	examples/de_decimal.lyx \
 	examples/de_splash.lyx \
+	examples/de_mathed.lyx \
+	examples/de_multicol.lyx \
 	examples/decimal.lyx \
 	examples/docbook_article.lyx \
 	examples/es_ejemplo_con_lyx.lyx \
@@ -792,7 +799,6 @@ dist_layouts_DATA =\
 	layouts/mwart.layout \
 	layouts/mwbk.layout \
 	layouts/mwrep.layout \
-	layouts/obsolete.inc \
 	layouts/paper.layout \
 	layouts/report.layout \
 	layouts/revtex.layout \
@@ -802,7 +808,6 @@ dist_layouts_DATA =\
 	layouts/scrclass.inc \
 	layouts/scrlettr.layout \
 	layouts/scrlttr2.layout \
-	layouts/scrmacros.inc \
 	layouts/scrreprt.layout \
 	layouts/seminar.layout \
 	layouts/siamltex.layout \
@@ -835,26 +840,6 @@ dist_layouts_DATA =\
 	layouts/g-brief2.layout \
 	layouts/svglobal.layout
 
-lyx2lyxdir = $(pkgdatadir)/lyx2lyx
-# We cannot use dist_lyx2lyx_SCRIPTS for lyx2lyx, since a possible
-# version-suffix would get appended to the names. So we use dist_scripts_DATA
-# and chmod manually in install-data-hook.
-dist_lyx2lyx_DATA = \
-	lyx2lyx/lyx2lyx \
-	lyx2lyx/parser_tools.py \
-	lyx2lyx/LyX.py \
-	lyx2lyx/lyx_0_12.py \
-	lyx2lyx/lyx_1_0_0.py \
-	lyx2lyx/lyx_1_0_1.py \
-	lyx2lyx/lyx_1_1_4.py \
-	lyx2lyx/lyx_1_1_5.py \
-	lyx2lyx/lyx_1_1_6.py \
-	lyx2lyx/lyx_1_1_6fix3.py \
-	lyx2lyx/lyx_1_2.py \
-	lyx2lyx/lyx_1_3.py \
-	lyx2lyx/lyx_1_4.py \
-	lyx2lyx/profiling.py
-
 scriptsdir = $(pkgdatadir)/scripts
 # We cannot use dist_scripts_SCRIPTS, since a possible version-suffix would
 # get appended to the names. So we use dist_scripts_DATA and chmod manually
@@ -866,6 +851,7 @@ dist_scripts_DATA = \
 	scripts/fig2pdftex.sh \
 	scripts/fig2pstex.sh \
 	scripts/fig_copy.sh \
+	scripts/layout2layout.py \
 	scripts/legacy_lyxpreview2ppm.py \
 	scripts/listerrors \
 	scripts/lyxpreview2bitmap.py \
@@ -911,40 +897,11 @@ dist_ui_DATA = \
 	ui/stdmenus.ui \
 	ui/stdtoolbars.ui
 
-$(srcdir)/configure: $(srcdir)/configure.m4
-	$(M4) $< > $@
-	$(CHMOD) 755 $@
-
-lyxrc.defaults: $(srcdir)/configure
-	$(SHELL) $<
-
-install-xfonts:
-	test -f xfonts/fonts.dir || exit 0 ; \
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/xfonts ; \
-	files=`sed -e 's/^[0-9]*$$//' -e 's/^\([^ ]*\) .*$$/\1/' xfonts/fonts.dir` ; \
-	for i in $${files} ; do \
-	  ln -f -s `kpsewhich $$i` $(DESTDIR)$(pkgdatadir)/xfonts/$$i ; \
-	done ; \
-	$(INSTALL_DATA) xfonts/fonts.dir $(DESTDIR)$(pkgdatadir)/xfonts/fonts.dir ; \
-	$(INSTALL_DATA) xfonts/fonts.scale $(DESTDIR)$(pkgdatadir)/xfonts/fonts.scale ; \
-	if test -f xfonts/PSres.upr ; then \
-	  $(INSTALL_DATA) xfonts/PSres.upr $(DESTDIR)$(pkgdatadir)/xfonts/PSres.upr ; \
-	fi
-
-uninstall-xfonts:
-	rm -rf $(DESTDIR)$(pkgdatadir)/xfonts
-
-distclean-local:
-	rm -rf xfonts
-
-install-data-local: install-xfonts
-
-
-uninstall-local: uninstall-xfonts
+lyxrc.defaults: $(srcdir)/configure.py
+	python $<
 
 install-data-hook:
-	$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/lyx2lyx/lyx2lyx
-	$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure
+	$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure.py
 	for i in $(dist_scripts_DATA); do \
 		$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/$$i; \
 	done