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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d1a17c2772..510eae7574 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,10 +2,9 @@ include $(top_srcdir)/config/common.am
 
 DISTCLEANFILES += texput.log textclass.lst packages.lst lyxrc.defaults
 
-SUBDIRS = doc reLyX lyx2lyx
+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 \
@@ -844,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 \
@@ -889,15 +897,11 @@ dist_ui_DATA = \
 	ui/stdmenus.ui \
 	ui/stdtoolbars.ui
 
-$(srcdir)/configure: $(srcdir)/configure.m4
-	$(M4) $< > $@
-	$(CHMOD) 755 $@
-
-lyxrc.defaults: $(srcdir)/configure
-	$(SHELL) $<
+lyxrc.defaults: $(srcdir)/configure.py
+	python $<
 
 install-data-hook:
-	$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure
+	$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure.py
 	for i in $(dist_scripts_DATA); do \
 		$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/$$i; \
 	done