X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FMakefile.am;h=721e7b80b36c3d8a20ceeb35666bd920d60510ad;hb=005545f28100fd30afa22313d6e3b1b67aa9a857;hp=1aa751be3cf9637c31bba13e38754babb943ab3b;hpb=7ec7c9da44662529e8a0ad4d60836df43a059ecd;p=lyx.git

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 1aa751be3c..721e7b80b3 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,70 +1,103 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/config/common.am
+
 noinst_LTLIBRARIES = libsupport.la
-LIBS =
-ETAGS_ARGS = --lang=c++
-BOOST_INCLUDES = -I$(top_srcdir)/boost
-INCLUDES = -I${srcdir}/../ $(BOOST_INCLUDES)
 
-EXTRA_DIST = lyxstring.C lyxstring.h regex.c lyxregex.h
+CLEANFILES = path_defines.C
 
-if USE_LYXSTRING
-LYXSTRING = lyxstring.C lyxstring.h
-endif
-if USE_REGEX
-REGEX = regex.c lyxregex.h
+INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
+
+EXTRA_DIST = path_defines.C.in os_unix.C os_win32.C os_os2.C
+
+if USE_COMPRESSION
+COMPRESSION = gzstream.C gzstream.h
 endif
 
+BUILT_SOURCES = path_defines.C
+
 libsupport_la_SOURCES = \
-	DebugStream.C \
-	DebugStream.h \
 	FileInfo.C \
 	FileInfo.h \
-	LAssert.C \
-	LAssert.h \
-	LIstream.h \
-	LOstream.h \
-	LRegex.C \
-	LRegex.h \
-	LSubstring.C \
-	LSubstring.h \
-	StrPool.C \
-	StrPool.h \
+	FileMonitor.h \
+	FileMonitor.C \
 	abort.C \
 	atoi.C \
 	chdir.C \
 	copy.C \
-	date.C \
+	copied_ptr.h \
+	cow_ptr.h \
+	debugstream.h \
+	filename.C \
+	filename.h \
 	filetools.C \
 	filetools.h \
-	fmt.C \
-	getUserName.C \
+	forkedcall.C \
+	forkedcall.h \
+	forkedcallqueue.C \
+	forkedcallqueue.h \
+	forkedcontr.C \
+	forkedcontr.h \
 	getcwd.C \
-	kill.C \
+	globbing.C \
+	globbing.h \
+	$(COMPRESSION) kill.C \
+	limited_stack.h \
 	lstrings.C \
 	lstrings.h \
-	lxtl.h \
 	lyxalgo.h \
 	lyxfunctional.h \
 	lyxlib.h \
 	lyxmanip.h \
-	$(LYXSTRING) lyxsum.C \
+	lyxtime.C \
+	lyxtime.h \
+	lyxsum.C \
 	mkdir.C \
+	nt_defines.h \
+	os.C \
+	os.h \
+	os2_defines.h \
+	os2_errortable.h \
 	path.C \
 	path.h \
+	path_defines.C \
+	path_defines.h \
 	putenv.C \
 	rename.C \
 	rmdir.C \
 	snprintf.h \
 	snprintf.c \
+	socktools.C \
+	socktools.h \
 	sstream.h \
-	$(REGEX) syscall.C \
-	syscall.h \
-	syscontr.C \
-	syscontr.h \
-	syssingleton.C \
+	std_istream.h \
+	std_ostream.h \
+	std_sstream.h \
+	systemcall.C \
+	systemcall.h \
 	tempname.C \
-	translator.h \
 	textutils.h \
+	tostr.h \
+	tostr.C \
+	translator.h \
+	types.h \
+	userinfo.C \
+	userinfo.h \
 	unlink.C
+
+
+path_defines.C: build_path_defines
+
+build_path_defines: path_defines.C.in
+	@rm -f tmp_path_defines ;\
+	ABS_SRCDIR=`cd $(top_srcdir) && pwd` ;\
+	ABS_BUILDDIR=`cd ../.. && pwd` ;\
+	sed "s,%LYX_DIR%,$(pkgdatadir), ;\
+		s,%LOCALEDIR%,$(datadir)/locale, ;\
+		s,%BUILDDIR%,$${ABS_BUILDDIR}, ;\
+		s,%TOP_SRCDIR%,$${ABS_SRCDIR}," \
+		$(srcdir)/path_defines.C.in > tmp_path_defines ;\
+	if cmp -s tmp_path_defines path_defines.C ; then \
+		rm -f tmp_path_defines ;\
+	else \
+		rm -f path_defines.C ;\
+		mv tmp_path_defines path_defines.C ;\
+	fi