X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffindlib%2FMakefile.in;h=d1e2950faaded19f499dc059f084b7b3e5e45307;hb=37190d54ceff7f2b45a58a1c6241688cc5cba1c2;hp=2bbdacc573ad6b9cf3ba4177be6642844bf0329b;hpb=989727a9b308d44693e2c220ba075cd574229d92;p=bacula%2Fbacula

diff --git a/bacula/src/findlib/Makefile.in b/bacula/src/findlib/Makefile.in
index 2bbdacc573..d1e2950faa 100644
--- a/bacula/src/findlib/Makefile.in
+++ b/bacula/src/findlib/Makefile.in
@@ -3,6 +3,8 @@
 #
 @MCOMMON@
 
+python = @PYTHON_INCDIR@
+
 srcdir =	.
 VPATH = 	.
 .PATH:		.
@@ -20,10 +22,10 @@ first_rule: all
 dummy:
 
 #
-LIBSRCS = find.c match.c find_one.c attibs.c create_file.c \
-	  bfile.c enable_priv.c fstype.c makepath.c save-cwd.c winapi.c
+LIBSRCS = find.c match.c find_one.c attribs.c create_file.c \
+	  bfile.c drivetype.c enable_priv.c fstype.c makepath.c save-cwd.c
 LIBOBJS = find.o match.o find_one.o attribs.o create_file.o \
-	  bfile.o enable_priv.o fstype.o makepath.o save-cwd.o winapi.o
+	  bfile.o drivetype.o enable_priv.o fstype.o makepath.o save-cwd.o
 
 .SUFFIXES:	.c .o
 .PHONY:
@@ -31,14 +33,16 @@ LIBOBJS = find.o match.o find_one.o attribs.o create_file.o \
 
 # 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) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 #-------------------------------------------------------------------------
 all: Makefile libfind.a ../lib/libbac.a
 	@echo "==== Make of findlib is good ===="
 	@echo " "
 
 libfind.a: $(LIBOBJS) 
-	$(RMF) $@
+	@echo "Making $@ ..."
+	@$(RMF) $@
 	$(AR) cr $@ $(LIBOBJS)
 	$(RANLIB) $@
 
@@ -59,7 +63,7 @@ realclean: clean
 
 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
@@ -81,12 +85,12 @@ 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
+	@$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
 	@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
 
 # -----------------------------------------------------------------------