Consistent use of preprocessor guards;

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

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index a039c82768cd531f8582c243e91c684d557aeb31..55095ed1871669774eb85689cddd6e84336dd76c 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -2,12 +2,12 @@ include $(top_srcdir)/config/common.am
 
 SUBDIRS = . tests
 
-noinst_LTLIBRARIES = libsupport.la
-
-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
@@ -27,6 +27,8 @@ libsupport_la_SOURCES = \
        copied_ptr.h \
        cow_ptr.h \
        debugstream.h \
+       environment.h \
+       environment.C \
        filefilterlist.C \
        filefilterlist.h \
        filename.C \
@@ -42,8 +44,6 @@ libsupport_la_SOURCES = \
        fs_extras.C \
        fs_extras.h \
        getcwd.C \
-       globbing.C \
-       globbing.h \
        $(COMPRESSION) kill.C \
        limited_stack.h \
        lstrings.C \
@@ -63,7 +63,6 @@ libsupport_la_SOURCES = \
        path.h \
        package.C \
        package.h \
-       putenv.C \
        rename.C \
        socktools.C \
        socktools.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 ;\