X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffindlib%2FMakefile.in;h=2b92e33742e29bc95c91357d597293a88fda5c10;hb=10cfd798ced2d27f61ead2de6fe9b1bcc8e3468d;hp=10ac601f957833fbfb7e67fbbdca9658c792b037;hpb=017cebd5c0b0efb1b9ed5af92b43d6a87fd34c6e;p=bacula%2Fbacula

diff --git a/bacula/src/findlib/Makefile.in b/bacula/src/findlib/Makefile.in
index 10ac601f95..2b92e33742 100644
--- a/bacula/src/findlib/Makefile.in
+++ b/bacula/src/findlib/Makefile.in
@@ -1,4 +1,7 @@
 #
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
 #  Find files library Makefile
 #
 @MCOMMON@
@@ -22,17 +25,16 @@ dummy:
 #
 # include files installed when using libtool
 #
-INCLUDE_FILES = bfile.h find.h protos.h savecwd.h
+INCLUDE_FILES = bfile.h find.h protos.h win32filter.h
 
 #
-LIBSRCS = find.c match.c find_one.c attribs.c create_file.c \
-	  bfile.c drivetype.c enable_priv.c fstype.c mkpath.c \
-	  savecwd.c
-LIBOBJS = $(LIBSRCS:.c=$(DEFAULT_OBJECT_TYPE))
+LIBBACFIND_SRCS = find.c match.c find_one.c attribs.c create_file.c \
+		  bfile.c drivetype.c enable_priv.c fstype.c mkpath.c \
+		  savecwd.c namedpipe.c win32filter.c
+LIBBACFIND_OBJS = $(LIBBACFIND_SRCS:.c=.o)
+LIBBACFIND_LOBJS = $(LIBBACFIND_SRCS:.c=.lo)
 
-LIBBACFIND_LT_CURRENT = 1
-LIBBACFIND_LT_REVISION = 0
-LIBBACFIND_LT_AGE = 0
+LIBBACFIND_LT_RELEASE = @LIBBACFIND_LT_RELEASE@
 
 .SUFFIXES:	.c .o .lo
 .PHONY:
@@ -51,14 +53,14 @@ all: Makefile libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_T
 	@echo "==== Make of findlib is good ===="
 	@echo " "
 
-libbacfind.a: $(LIBOBJS) 
+libbacfind.a: $(LIBBACFIND_OBJS)
 	@echo "Making $@ ..."
-	$(AR) rc  $@ $(LIBOBJS)
+	$(AR) rc  $@ $(LIBBACFIND_OBJS)
 	$(RANLIB) $@
 
-libbacfind.la: $(LIBOBJS) 
+libbacfind.la: Makefile $(LIBBACFIND_LOBJS)
 	@echo "Making $@ ..."
-	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBOBJS) -export-dynamic -rpath $(libdir) -version-info $(LIBBACFIND_LT_CURRENT):$(LIBBACFIND_LT_REVISION):$(LIBBACFIND_LT_AGE)
+	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_RELEASE)
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 	cd $(topdir) \
@@ -66,18 +68,19 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 
 install-includes:
 	$(MKDIR) $(DESTDIR)/$(includedir)/bacula/findlib
-	for I in ${INCLUDE_FILES}; do \
+	for I in $(INCLUDE_FILES); do \
 	   $(INSTALL_DATA) $$I $(DESTDIR)$(includedir)/bacula/findlib/`basename $$I`; \
 	done
 
 uninstall-includes:
-	for I in ${INCLUDE_FILES}; do \
+	for I in $(INCLUDE_FILES); do \
 	   $(RMF) $(DESTDIR)$(includedir)/bacula/findlib/`basename $$I`; \
 	done
 
 libtool-install: all
 	$(MKDIR) $(DESTDIR)$(libdir)
-	$(LIBTOOL_INSTALL_FINISH) $(INSTALL_PROGRAM) libbacfind$(DEFAULT_ARCHIVE_TYPE) $(DESTDIR)$(libdir)
+	$(RMF) $(DESTDIR)$(libdir)/libbacfind-*.so $(DESTDIR)$(libdir)/libbacfind.la
+	$(LIBTOOL_INSTALL_FINISH) $(INSTALL_LIB) libbacfind$(DEFAULT_ARCHIVE_TYPE) $(DESTDIR)$(libdir)
 
 libtool-uninstall:
 	$(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacfind.la
@@ -87,15 +90,15 @@ install: @LIBTOOL_INSTALL_TARGET@ @INCLUDE_INSTALL_TARGET@
 uninstall: @LIBTOOL_UNINSTALL_TARGET@ @INCLUDE_UNINSTALL_TARGET@
 
 libtool-clean:
-	find . -name '*.lo' -print | xargs $(LIBTOOL_CLEAN) $(RMF)
-	$(RMF) *.la
-	$(RMF) -r .libs _libs
+	@find . -name '*.lo' -print | xargs $(LIBTOOL_CLEAN) $(RMF)
+	@$(RMF) *.la
+	@$(RMF) -r .libs _libs
 
-clean: @LIBTOOL_CLEAN_TARGET@
-	$(RMF) find core a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
+clean:	libtool-clean
+	@$(RMF) find core a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
 
 realclean: clean
-	$(RMF) tags
+	@$(RMF) tags
 
 distclean: realclean
 	if test $(srcdir) = .; then $(MAKE) realclean; fi
@@ -114,7 +117,9 @@ depend:
 	@$(MV) Makefile Makefile.bak
 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
 	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
-	@$(CXX) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
+	@for src in $(LIBBACFIND_SRCS); do \
+	    $(CXX) -S -M -MT `basename $$src .c`$(DEFAULT_OBJECT_TYPE) $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $$src >> Makefile; \
+	done
 	@if test -f Makefile ; then \
 	    $(RMF) Makefile.bak; \
 	else \