Consistent use of preprocessor guards;

[lyx.git] / src / support / Makefile.am

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index de6adecb9c6387474a856a33739525f7eb056729..55095ed1871669774eb85689cddd6e84336dd76c 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -1,11 +1,13 @@
 include $(top_srcdir)/config/common.am
 
-noinst_LTLIBRARIES = libsupport.la
+SUBDIRS = . tests
 
-CLEANFILES += path_defines.C
+CLEANFILES += $(BUILT_SOURCES)
 
 EXTRA_DIST = package.C.in os_unix.C os_win32.C os_os2.C
 
+noinst_LTLIBRARIES = libsupport.la
+
 if USE_COMPRESSION
 COMPRESSION = gzstream.C gzstream.h
 endif
@@ -15,12 +17,9 @@ BUILT_SOURCES = package.C
 AM_CPPFLAGS = $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
 
 libsupport_la_SOURCES = \
-       FileInfo.C \
-       FileInfo.h \
        FileMonitor.h \
        FileMonitor.C \
        abort.C \
-       atoi.C \
        chdir.C \
        convert.C \
        convert.h \
@@ -28,6 +27,8 @@ libsupport_la_SOURCES = \
        copied_ptr.h \
        cow_ptr.h \
        debugstream.h \
+       environment.h \
+       environment.C \
        filefilterlist.C \
        filefilterlist.h \
        filename.C \
@@ -40,9 +41,9 @@ libsupport_la_SOURCES = \
        forkedcallqueue.h \
        forkedcontr.C \
        forkedcontr.h \
+       fs_extras.C \
+       fs_extras.h \
        getcwd.C \
-       globbing.C \
-       globbing.h \
        $(COMPRESSION) kill.C \
        limited_stack.h \
        lstrings.C \
@@ -62,9 +63,7 @@ libsupport_la_SOURCES = \
        path.h \
        package.C \
        package.h \
-       putenv.C \
        rename.C \
-       rmdir.C \
        socktools.C \
        socktools.h \
        std_istream.h \
@@ -82,13 +81,14 @@ libsupport_la_SOURCES = \
 
 package.C: build_package
 
+# Solaris sed does not like spaces bewteen the ;-delimited commands
 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,%TOP_SRCDIR%,$${ABS_SRCDIR}," \
+       sed "s,%LYX_DIR%,$(pkgdatadir),;\
+s,%LOCALEDIR%,$(datadir)/locale,;\
+s,%TOP_SRCDIR%,$${ABS_SRCDIR}," \
                $(srcdir)/package.C.in > tmp_package ;\
        if cmp -s tmp_package package.C ; then \
                rm -f tmp_package ;\