-#
-SVRSRCS = stored.c append.c askdir.c authenticate.c block.c dev.c \
- device.c dircmd.c fd_cmds.c fdmsg.c job.c \
- label.c match_bsr.c parse_bsr.c \
- read.c record.c stored_conf.c
-SVROBJS = stored.o append.o askdir.o authenticate.o block.o dev.o \
- device.o dircmd.o fd_cmds.o fdmsg.o job.o \
- label.o match_bsr.o parse_bsr.o \
- read.o record.o stored_conf.o
-
-# bpool is depricated
-#POOLSRCS = bpool.c block.c dev.c device.c askdir.c label.c \
-# record.c stored_conf.c
-#POOLOBJS = bpool.o block.o dev.o device.o askdir.o label.o \
-# record.o stored_conf.o
-
-#
-TAPESRCS = btape.c block.c dev.c device.c askdir.c label.c \
- record.c stored_conf.c
-TAPEOBJS = btape.o block.o dev.o device.o askdir.o label.o \
- record.o stored_conf.o
-
-BLSOBJS = bls.o block.o device.o dev.o label.o record.o
-
+# bacula-sd
+SVRSRCS = stored.c ansi_label.c \
+ autochanger.c acquire.c append.c \
+ askdir.c authenticate.c \
+ block.c butil.c dev.c \
+ device.c dircmd.c dvd.c ebcdic.c fd_cmds.c job.c \
+ label.c match_bsr.c mount.c parse_bsr.c \
+ pythonsd.c read.c read_record.c record.c \
+ reserve.c \
+ spool.c status.c stored_conf.c wait.c
+SVROBJS = stored.o ansi_label.o \
+ autochanger.o acquire.o append.o \
+ askdir.o authenticate.o \
+ block.o butil.o dev.o \
+ device.o dircmd.o dvd.o ebcdic.c fd_cmds.o job.o \
+ label.o match_bsr.o mount.o parse_bsr.o \
+ pythonsd.o read.o read_record.o record.o \
+ reserve.o \
+ spool.o status.o stored_conf.o wait.o
+
+# btape
+TAPESRCS = btape.c block.c butil.c dev.c device.c label.c \
+ ansi_label.c dvd.c ebcdic.c \
+ acquire.c mount.c record.c read_record.c \
+ stored_conf.c match_bsr.c parse_bsr.c spool.c
+TAPEOBJS = btape.o block.o butil.o dev.o device.o label.o \
+ ansi_label.o dvd.o ebcdic.o \
+ autochanger.o acquire.o mount.o record.o read_record.o \
+ stored_conf.o match_bsr.o parse_bsr.o spool.o wait.o
+
+# bls
+BLSOBJS = bls.o block.o butil.o device.o dev.o label.o match_bsr.o \
+ ansi_label.o dvd.o ebcdic.o \
+ autochanger.o acquire.o mount.o parse_bsr.o record.o \
+ read_record.o stored_conf.o spool.o wait.o
+
+# bextract