From: Marco van Wieringen <mvw@planets.elm.net>
Date: Wed, 4 Jan 2012 18:40:00 +0000 (+0100)
Subject: Move ini.c to libbaccfg from libbac
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3e1b58b34d1b57164fd66aae3584c00be3adf87f;p=bacula%2Fbacula

Move ini.c to libbaccfg from libbac
---

diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in
index ab0d9c17f3..5e0a0f14a5 100644
--- a/bacula/src/lib/Makefile.in
+++ b/bacula/src/lib/Makefile.in
@@ -58,7 +58,7 @@ LIBBAC_SRCS = attr.c base64.c berrno.c bsys.c binflate.c bget_msg.c \
 	      rwlock.c scan.c sellist.c serial.c sha1.c \
 	      signal.c smartall.c rblist.c tls.c tree.c \
 	      util.c var.c watchdog.c workq.c btimers.c \
-	      address_conf.c breg.c htable.c lockmgr.c devlock.c ini.c
+	      address_conf.c breg.c htable.c lockmgr.c devlock.c
 
 LIBBAC_OBJS = $(LIBBAC_SRCS:.c=.o)
 LIBBAC_LOBJS = $(LIBBAC_SRCS:.c=.lo)
@@ -66,7 +66,7 @@ LIBBAC_LOBJS = $(LIBBAC_SRCS:.c=.lo)
 #
 # libbaccfg (config functions)
 #
-LIBBACCFG_SRCS = parse_conf.c res.c
+LIBBACCFG_SRCS = ini.c parse_conf.c res.c
 LIBBACCFG_OBJS = $(LIBBACCFG_SRCS:.c=.o)
 LIBBACCFG_LOBJS = $(LIBBACCFG_SRCS:.c=.lo)
 
@@ -210,7 +210,7 @@ bsnprintf: Makefile bsnprintf.o
 ini: Makefile ini.o
 	rm -f ini.o
 	$(CXX) -DTEST_PROGRAM $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE)  $(CFLAGS) ini.c
-	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L. -o $@ ini.o -lbac $(DLIB) -lm $(LIBS) $(OPENSSL_LIBS)
+	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L. -o $@ ini.o -lbaccfg -lbac $(DLIB) -lm $(LIBS) $(OPENSSL_LIBS)
 	rm -f ini.o
 	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) ini.c