X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2FMakefile.am;h=47ad20e263eefc954b5a3b596dd761f6435956f3;hb=342cdf432246110db37bee4e0aebb4b72c933ddb;hp=a21958e61afa810385f271d1305b88992fd99df6;hpb=e13d9157bca1cfce49ed43de7df3c6619bf42a1f;p=lyx.git

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index a21958e61a..47ad20e263 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,20 +1,20 @@
 include $(top_srcdir)/config/common.am
 
+SUBDIRS = . tests
+
 noinst_LTLIBRARIES = libsupport.la
 
 CLEANFILES += path_defines.C
 
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
-
-EXTRA_DIST = path_defines.C.in os_unix.C os_win32.C os_os2.C
+EXTRA_DIST = package.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
+BUILT_SOURCES = package.C
 
-AM_CXXFLAGS = $(PCH_FLAGS)
+AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
 
 libsupport_la_SOURCES = \
 	FileInfo.C \
@@ -22,12 +22,15 @@ libsupport_la_SOURCES = \
 	FileMonitor.h \
 	FileMonitor.C \
 	abort.C \
-	atoi.C \
 	chdir.C \
+	convert.C \
+	convert.h \
 	copy.C \
 	copied_ptr.h \
 	cow_ptr.h \
 	debugstream.h \
+	filefilterlist.C \
+	filefilterlist.h \
 	filename.C \
 	filename.h \
 	filetools.C \
@@ -46,7 +49,6 @@ libsupport_la_SOURCES = \
 	lstrings.C \
 	lstrings.h \
 	lyxalgo.h \
-	lyxfunctional.h \
 	lyxlib.h \
 	lyxmanip.h \
 	lyxtime.C \
@@ -59,8 +61,8 @@ libsupport_la_SOURCES = \
 	os2_errortable.h \
 	path.C \
 	path.h \
-	path_defines.C \
-	path_defines.h \
+	package.C \
+	package.h \
 	putenv.C \
 	rename.C \
 	rmdir.C \
@@ -72,8 +74,6 @@ libsupport_la_SOURCES = \
 	systemcall.h \
 	tempname.C \
 	textutils.h \
-	tostr.h \
-	tostr.C \
 	translator.h \
 	types.h \
 	userinfo.C \
@@ -81,20 +81,19 @@ libsupport_la_SOURCES = \
 	unlink.C
 
 
-path_defines.C: build_path_defines
+package.C: build_package
 
-build_path_defines: path_defines.C.in
-	@rm -f tmp_path_defines ;\
+build_package: package.C.in
+	@rm -f tmp_package ;\
 	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 ;\
+		$(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