X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Flib%2FMakefile.in;h=573e294da1f6e4c6f387ac51dcc6437f2d00081e;hb=0adeb3fa948d42218c72dd204b3f8e5b1f919db9;hp=df0ba1335b5d968bba78d4165db55637e70b5c18;hpb=bb4293987242ec3a155a84d8a094b54134815ebc;p=bacula%2Fbacula

diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in
index df0ba1335b..573e294da1 100644
--- a/bacula/src/lib/Makefile.in
+++ b/bacula/src/lib/Makefile.in
@@ -1,16 +1,7 @@
 # $Id$
 @MCOMMON@
 
-CWEB = @CWEB@
-CTANGLE = $(CWEB)/ctangle
-CWEAVE = $(CWEB)/cweave
-TEXINPUTS = TEXINPUTS=.:$(CWEB):
-
-# FIXME -- These should be found by autoconf
-TEX = tex
-PDFTEX = pdftex
-XDVI = xdvi
-DVIPS = dvips
+python = @PYTHON_INCDIR@
 
 srcdir =	.
 VPATH = 	.
@@ -23,35 +14,39 @@ topdir = ../..
 # this dir relative to top dir
 thisdir = src/lib
 
+OPENSSL_LIBS = @OPENSSL_LIBS@
+OPENSSL_INC = @OPENSSL_INC@
 
 DEBUG=@DEBUG@
 
-GMP_INC=@GMP_INC@
-
 first_rule: all
 dummy:
 
-LIBSRCS = alloc.c base64.c bmisc.c bnet.c bnet_server.c \
-	  bshm.c btime.c \
-	  cram-md5.c crc32.c create_file.c daemon.c fnmatch.c \
-	  hmac.c idcache.c jcr.c lex.c	\
-	  makepath.c \
+LIBSRCS = alloc.c attr.c base64.c berrno.c bsys.c bget_msg.c \
+	  bnet.c bnet_server.c \
+	  bpipe.c bshm.c bsnprintf.c btime.c \
+	  cram-md5.c crc32.c daemon.c edit.c fnmatch.c \
+	  hmac.c idcache.c jcr.c lex.c alist.c dlist.c \
 	  md5.c message.c mem_pool.c parse_conf.c \
-	  queue.c rwlock.c save-cwd.c serial.c \
-	  signal.c smartall.c tree.c util.c watchdog.c workq.c	
-
-#	  immortal.c filesys.c
-
-LIBOBJS = alloc.o base64.o bmisc.o bnet.o bnet_server.o \
-	  bshm.o btime.o \
-	  cram-md5.o crc32.o create_file.o daemon.o fnmatch.o \
-	  hmac.o idcache.o jcr.o lex.o	\
-	  makepath.o \
+	  queue.c regex.c \
+	  res.c rwlock.c scan.c serial.c sha1.c \
+	  semlock.c signal.c smartall.c tls.c tree.c \
+	  util.c var.c watchdog.c workq.c btimers.c \
+	  address_conf.c pythonlib.c 
+
+
+LIBOBJS = alloc.o attr.o base64.o berrno.o bsys.o bget_msg.o \
+	  bnet.o bnet_server.o \
+	  bpipe.o bshm.o bsnprintf.o btime.o \
+	  cram-md5.o crc32.o daemon.o edit.o fnmatch.o \
+	  hmac.o idcache.o jcr.o lex.o alist.o dlist.o \
 	  md5.o message.o mem_pool.o parse_conf.o \
-	  queue.o rwlock.o save-cwd.o serial.o \
-	  signal.o smartall.o tree.o util.o watchdog.o workq.o
+	  queue.o regex.o \
+	  res.o rwlock.o scan.o serial.o sha1.o \
+	  semlock.o signal.o smartall.o tls.o tree.o \
+	  util.o var.o watchdog.o workq.o btimers.o \
+	  address_conf.o pythonlib.o
 
-#	  immortal.o filesys.o
 
 EXTRAOBJS = @OBJLIST@
 
@@ -62,25 +57,10 @@ EXTRAOBJS = @OBJLIST@
 
 # inference rules
 .c.o:
-	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+	$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 .cc.o:
-	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
-
-.w.c:
-	$(CTANGLE) $<
-
-.w.tex:
-	$(CWEAVE) $<
-
-.tex.dvi:
-	( $(TEXINPUTS) ; export TEXINPUTS; $(TEX) $< )
-
-.tex.pdf:
-	( $(TEXINPUTS) ; export TEXINPUTS; $(PDFTEX) $< )
-
-.dvi.view:
-	$(XDVI) -s 0 $<
+	$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 #-------------------------------------------------------------------------
 all: Makefile libbac.a
@@ -88,19 +68,46 @@ all: Makefile libbac.a
 	@echo " "
 
 libbac.a: $(LIBOBJS)
-	$(AR) rcs $@ $(LIBOBJS)
+	$(AR) rc  $@ $(LIBOBJS)
+	$(RANLIB) $@
 
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 	cd $(topdir) \
 	  && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-rwlock_test:  rwlock.o
+pythonlib.o: pythonlib.c
+	$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(python) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+
+rwlock_test:
 	rm -f rwlock.o
 	$(CXX) -DTEST_RWLOCK $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE)  $(CFLAGS) rwlock.c
 	$(CXX) $(LDFLAGS) -L. -o $@ rwlock.o $(LIBS) $(DLIB) -lbac -lm
 	rm -f rwlock.o
 	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) rwlock.c
+
+md5sum: md5.o	
+	rm -f md5.o
+	$(CXX) -DMD5_SUM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE)  $(CFLAGS) md5.c
+	$(CXX) $(LDFLAGS) -L. -o $@ md5.o $(LIBS) $(DLIB) -lbac $(OPENSSL_LIBS) -lm
+	rm -f md5.o
+	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) md5.c
+
+
+sha1sum: sha1.o
+	rm -f sha1.o
+	$(CXX) -DSHA1_SUM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE)	$(CFLAGS) sha1.c
+	$(CXX) $(LDFLAGS) -L. -o $@ sha1.o $(LIBS) $(DLIB) -lbac $(OPENSSL_LIBS) -lm
+	rm -f sha1.o
+	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) sha1.c
+
+bsnprintf: bsnprintf.o
+	rm -f bsnprintf.o
+	$(CXX) -DTEST_PROGRAM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE)  $(CFLAGS) bsnprintf.c
+	$(CXX) $(LDFLAGS) -L. -o $@ bsnprintf.o $(LIBS) $(DLIB) -lbac $(OPENSSL_LIBS) -lm
+	rm -f bsnprintf.o
+	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) bsnprintf.c
+	
 	 
 install:
 
@@ -108,14 +115,14 @@ uninstall:
 
 clean:
 	$(RMF) *.a core a.out *.o *.bak *.tex *.pdf *~ *.intpro *.extpro 1 2 3
-	$(RMF) rwlock_test
+	$(RMF) rwlock_test md5sum sha1sum
 
 realclean: clean
 	$(RMF) tags
 
 distclean: realclean
 	if test $(srcdir) = .; then $(MAKE) realclean; fi
-	(cd $(srcdir); $(RMF) Makefile)
+	(cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS)
 
 # Semi-automatic generation of dependencies:
 # Use gcc -MM because X11 `makedepend' doesn't work on all systems
@@ -126,7 +133,7 @@ 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 \