* Version 1.1.9 released.

[cln.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 1a6c95a13321a91d65a3ea76d1235f9b4c2b2a64..77b1a102222a749fefc97b36022309282f175adf 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -27,6 +27,7 @@ CXXFLAGS = @CXXFLAGS@
 CXXCPP = @CXXCPP@
 INCLUDES = -I../include -I$(top_srcdir)/include
 override CPPFLAGS += $(INCLUDES)
+LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile
@@ -64,8 +65,10 @@ top_builddir = ..
 SUBDIR = .
 
 # Define the search path for sources.
-# The ":" below keeps config.status from removing this line.
-VPATH = $(srcdir)/$(SUBDIR) # :
+# The variable $(aux_srcdir) is needed because new versions of aufoconf tend to
+# remove $(srcdir), ${srcdir} and so on...
+aux_srcdir = @srcdir@
+VPATH = $(aux_srcdir)/$(SUBDIR)
 
 # Add subdirectory specific flags.
 include $(srcdir)/$(SUBDIR)/Makeflags
@@ -94,9 +97,9 @@ OBJECTS_LO = $(FILES_LO) $(ASMFILES_LO)
 SUBDIRS := $(patsubst $(srcdir)/%/.,%,$(wildcard $(srcdir)/$(SUBDIR)/*/.))
 # Avoid certain subdirectories:
 #   private/ and old/ don't contain valid sources,
-#   CVS/ and RCS/ are created when people put the sources under version control,
+#   CVS/, RCS/ and SCCS/ are created when people put the sources under version control,
 #   ii_files/ is created during "make" by SGI C++.
-SUBDIRS := $(filter-out old ./old private ./private CVS %/CVS RCS %/RCS ii_files ./ii_files,$(SUBDIRS))
+SUBDIRS := $(filter-out old ./old private ./private CVS %/CVS RCS %/RCS SCCS %/SCCS ii_files ./ii_files,$(SUBDIRS))
 
 SUBDIRS_TARGET := $(patsubst %,%.target,$(SUBDIRS))
 SUBDIRS_DIRDEP := $(patsubst %,%.dirdep,$(SUBDIRS))
@@ -197,12 +200,14 @@ $(SUBDIRS_DIRDEP) : %.dirdep :
 
 ifeq ($(SUBDIR),.)
 
+$(ALLOBJECTS_LO) : $(SUBDIRS_TARGET)
+
 libcln.la : $(LIBTOOL) $(ALLOBJECTS_LO)
        $(LIBTOOL_LINK) $(CC) -o libcln.la -rpath $(libdir) -version-info $(CL_CURRENT):$(CL_REVISION):$(CL_AGE) $(LDFLAGS) $(LIBS) $(ALLOBJECTS_LO)
 
 install : all force
        $(MKDIR) $(DESTDIR)$(libdir)
-       $(LIBTOOL_INSTALL) $(INSTALL_DATA) libcln.la $(DESTDIR)$(libdir)/libcln.la
+       $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) libcln.la $(DESTDIR)$(libdir)/libcln.la
        $(MKDIR) $(DESTDIR)$(includedir)/cln
        $(INSTALL_DATA) $(top_srcdir)/include/cln/*.h $(DESTDIR)$(includedir)/cln
        $(INSTALL_DATA) ../include/cln/*.h $(DESTDIR)$(includedir)/cln