X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FMakefile.am;h=de535eebb3c643c15e3d92f09feaa894ea9e6673;hb=6a947f349b15309c950d1657faab7dfc5b7a5bd9;hp=7cc59197fe8e90f00e693efab6ca075bc4b6ff79;hpb=dedb1e065b299473a9c160ba2c0095c42e0edaea;p=lyx.git

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 7cc59197fe..de535eebb3 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,76 +1,101 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+include $(top_srcdir)/config/common.am
+
+SUBDIRS = . tests
+
+CLEANFILES += $(BUILT_SOURCES)
+
+EXTRA_DIST = package.C.in pch.h \
+	os_cygwin.C os_unix.C os_win32.C os_win32.h
+
 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 \
-             os_unix.C os_win32.C os_os2.C
+libsupport_la_LIBADD = $(LIBSHLWAPI)
 
-if USE_LYXSTRING
-LYXSTRING = lyxstring.C lyxstring.h
-endif
-if USE_REGEX
-REGEX = regex.c lyxregex.h
-endif
+BUILT_SOURCES = $(PCH_FILE) package.C
+
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
 
 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 \
-	os.C \
-	os.h \
-	StrPool.C \
-	StrPool.h \
+	FileMonitor.h \
+	FileMonitor.C \
+	RandomAccessList.h \
 	abort.C \
-	atoi.C \
 	chdir.C \
+	convert.C \
+	convert.h \
 	copy.C \
-	date.C \
+	copied_ptr.h \
+	cow_ptr.h \
+	debugstream.h \
+	docstring.C \
+	docstring.h \
+	environment.h \
+	environment.C \
+	filefilterlist.C \
+	filefilterlist.h \
+	filename.C \
+	filename.h \
 	filetools.C \
 	filetools.h \
-	fmt.C \
-	getUserName.C \
+	fontutils.C \
+	fontutils.h \
+	forkedcall.C \
+	forkedcall.h \
+	forkedcallqueue.C \
+	forkedcallqueue.h \
+	forkedcontr.C \
+	forkedcontr.h \
+	fs_extras.C \
+	fs_extras.h \
 	getcwd.C \
 	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 \
+	os.C \
+	os.h \
 	path.C \
 	path.h \
-	putenv.C \
+	package.C \
+	package.h \
 	rename.C \
-	rmdir.C \
-	smart_ptr.h \
-	snprintf.h \
-	snprintf.c \
-	sstream.h \
-	$(REGEX) syscall.C \
-	syscall.h \
-	syscontr.C \
-	syscontr.h \
-	syssingleton.C \
+	socktools.C \
+	socktools.h \
+	std_istream.h \
+	std_ostream.h \
+	systemcall.C \
+	systemcall.h \
 	tempname.C \
-	translator.h \
 	textutils.h \
-	unlink.C \
-	utility.h
+	translator.h \
+	types.h \
+	userinfo.C \
+	userinfo.h \
+	unicode.C \
+	unicode.h \
+	unlink.C
+
+
+package.C: build_package
 
+# Solaris sed does not like spaces bewteen the ;-delimited commands
+build_package: package.C.in
+	@rm -f tmp_package ;\
+	sed "s,%LYX_DIR%,$(LYX_ABS_INSTALLED_DATADIR),;\
+s,%LOCALEDIR%,$(LYX_ABS_INSTALLED_LOCALEDIR),;\
+s,%TOP_SRCDIR%,$(LYX_ABS_TOP_SRCDIR),;\
+s,%PROGRAM_SUFFIX%,$(program_suffix)," \
+		$(srcdir)/package.C.in > tmp_package ;\
+	if cmp -s tmp_package package.C ; then \
+		rm -f tmp_package ;\
+	else \
+		rm -f package.C ;\
+		mv tmp_package package.C ;\
+	fi