X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=bacula%2Fsrc%2Ffindlib%2FMakefile.in;h=bb3161e866f3bf375ee45250ab617e8a1e4613c7;hb=2a7fda9473a7ac2669f59e9ff0dec1cba8b12ef1;hp=409a71474df6e2132a3fec5a4886f1bb4da3eb3f;hpb=7a8223a12817463f756d40720d2b791fdc625500;p=bacula%2Fbacula

diff --git a/bacula/src/findlib/Makefile.in b/bacula/src/findlib/Makefile.in
index 409a71474d..bb3161e866 100644
--- a/bacula/src/findlib/Makefile.in
+++ b/bacula/src/findlib/Makefile.in
@@ -20,58 +20,90 @@ first_rule: all
 dummy:
 
 #
-LIBSRCS = find.c match.c find_one.c attibs.c create_file.c \
-	  bfile.c enable_priv.c makepath.c save-cwd.c winapi.c
-LIBOBJS = find.o match.o find_one.o attribs.o create_file.o \
-	  bfile.o enable_priv.o makepath.o save-cwd.o winapi.o
+# include files installed when using libtool
+#
+INCLUDE_FILES = bfile.h find.h protos.h 
+
+#
+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
+LIBBACFIND_OBJS = $(LIBBACFIND_SRCS:.c=.o)
+LIBBACFIND_LOBJS = $(LIBBACFIND_SRCS:.c=.lo)
+
+LIBBACFIND_LT_RELEASE = @LIBBACFIND_LT_RELEASE@
 
-.SUFFIXES:	.c .o
+.SUFFIXES:	.c .o .lo
 .PHONY:
 .DONTCARE:
 
 # inference rules
 .c.o:
-	$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+	@echo "Compiling $<"
+	$(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+
+.c.lo:
+	@echo "Compiling $<"
+	$(NO_ECHO)$(LIBTOOL_COMPILE) $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 #-------------------------------------------------------------------------
-all: Makefile libfind.a ../lib/libbac.a
+all: Makefile libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
 	@echo "==== Make of findlib is good ===="
 	@echo " "
 
-libfind.a: $(LIBOBJS) 
-	$(RMF) $@
-	$(AR) cr $@ $(LIBOBJS)
+libbacfind.a: $(LIBBACFIND_OBJS) 
+	@echo "Making $@ ..."
+	$(AR) rc  $@ $(LIBBACFIND_OBJS)
 	$(RANLIB) $@
 
+libbacfind.la: Makefile $(LIBBACFIND_LOBJS) 
+	@echo "Making $@ ..."
+	$(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) \
 	  && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-install:
+install-includes:
+	$(MKDIR) $(DESTDIR)/$(includedir)/bacula/findlib
+	for I in $(INCLUDE_FILES); do \
+	   $(INSTALL_DATA) $$I $(DESTDIR)$(includedir)/bacula/findlib/`basename $$I`; \
+	done
+
+uninstall-includes:
+	for I in $(INCLUDE_FILES); do \
+	   $(RMF) $(DESTDIR)$(includedir)/bacula/findlib/`basename $$I`; \
+	done
+
+libtool-install: all
+	$(MKDIR) $(DESTDIR)$(libdir)
+	$(LIBTOOL_INSTALL_FINISH) $(INSTALL_LIB) libbacfind$(DEFAULT_ARCHIVE_TYPE) $(DESTDIR)$(libdir)
 
-uninstall:
+libtool-uninstall:
+	$(LIBTOOL_UNINSTALL) $(RMF) $(DESTDIR)$(libdir)/libbacfind.la
 
+install: @LIBTOOL_INSTALL_TARGET@ @INCLUDE_INSTALL_TARGET@
 
-clean:
-	$(RMF) find core a.out *.a *.o *.bak *~ *.intpro *.extpro 1 2 3
+uninstall: @LIBTOOL_UNINSTALL_TARGET@ @INCLUDE_UNINSTALL_TARGET@
+
+libtool-clean:
+	@find . -name '*.lo' -print | xargs $(LIBTOOL_CLEAN) $(RMF)
+	@$(RMF) *.la
+	@$(RMF) -r .libs _libs
+
+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
-	(cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
+	(cd $(srcdir); $(RMF) Makefile)
 
 devclean: realclean
 	if test $(srcdir) = .; then $(MAKE) realclean; fi
 	(cd $(srcdir); $(RMF) Makefile)
 
-install:
-
-
-uninstall:
-
-
-
 # Semi-automatic generation of dependencies:
 # Use gcc -M  because X11 `makedepend' doesn't work on all systems
 # and it also includes system headers.
@@ -81,12 +113,14 @@ depend:
 	@$(MV) Makefile Makefile.bak
 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
 	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
-	@$(CC) -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) $(SQL_INC) $$src >> Makefile; \
+	done
 	@if test -f Makefile ; then \
 	    $(RMF) Makefile.bak; \
 	else \
 	   $(MV) Makefile.bak Makefile; \
-	   echo -e "Something went wrong\n\a"; \
+	   echo " ===== Something went wrong in make depend ====="; \
 	fi
 
 # -----------------------------------------------------------------------