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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 85b6e14916..de535eebb3 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,50 +1,58 @@
 include $(top_srcdir)/config/common.am
 
-noinst_LTLIBRARIES = libsupport.la
+SUBDIRS = . tests
+
+CLEANFILES += $(BUILT_SOURCES)
 
-CLEANFILES = path_defines.C
+EXTRA_DIST = package.C.in pch.h \
+	os_cygwin.C os_unix.C os_win32.C os_win32.h
 
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
+noinst_LTLIBRARIES = libsupport.la
 
-EXTRA_DIST = path_defines.C.in os_unix.C os_win32.C os_os2.C
+libsupport_la_LIBADD = $(LIBSHLWAPI)
 
-if USE_COMPRESSION
-COMPRESSION = gzstream.C gzstream.h
-endif
+BUILT_SOURCES = $(PCH_FILE) package.C
 
-BUILT_SOURCES = path_defines.C
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
 
 libsupport_la_SOURCES = \
-	FileInfo.C \
-	FileInfo.h \
 	FileMonitor.h \
 	FileMonitor.C \
+	RandomAccessList.h \
 	abort.C \
-	atoi.C \
 	chdir.C \
+	convert.C \
+	convert.h \
 	copy.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 \
+	fontutils.C \
+	fontutils.h \
 	forkedcall.C \
 	forkedcall.h \
 	forkedcallqueue.C \
 	forkedcallqueue.h \
 	forkedcontr.C \
 	forkedcontr.h \
+	fs_extras.C \
+	fs_extras.h \
 	getcwd.C \
-	globbing.C \
-	globbing.h \
-	$(COMPRESSION) kill.C \
+	kill.C \
 	limited_stack.h \
 	lstrings.C \
 	lstrings.h \
 	lyxalgo.h \
-	lyxfunctional.h \
 	lyxlib.h \
 	lyxmanip.h \
 	lyxtime.C \
@@ -53,50 +61,41 @@ libsupport_la_SOURCES = \
 	mkdir.C \
 	os.C \
 	os.h \
-	os2_defines.h \
-	os2_errortable.h \
 	path.C \
 	path.h \
-	path_defines.C \
-	path_defines.h \
-	putenv.C \
+	package.C \
+	package.h \
 	rename.C \
-	rmdir.C \
-	snprintf.h \
-	snprintf.c \
 	socktools.C \
 	socktools.h \
-	sstream.h \
 	std_istream.h \
 	std_ostream.h \
-	std_sstream.h \
 	systemcall.C \
 	systemcall.h \
 	tempname.C \
 	textutils.h \
-	tostr.h \
-	tostr.C \
 	translator.h \
 	types.h \
 	userinfo.C \
 	userinfo.h \
+	unicode.C \
+	unicode.h \
 	unlink.C
 
 
-path_defines.C: build_path_defines
+package.C: build_package
 
-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 ;\
+# 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 path_defines.C ;\
-		mv tmp_path_defines path_defines.C ;\
+		rm -f package.C ;\
+		mv tmp_package package.C ;\
 	fi