-#
-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 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 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 askdir.o label.o record.o
+# bacula-sd
+SDOBJS = stored.o ansi_label.o faketape.o \
+ autochanger.o acquire.o append.o \
+ askdir.o authenticate.o \
+ block.o butil.o dev.o \
+ device.o dircmd.o dvd.o ebcdic.o fd_cmds.o job.o \
+ label.o lock.o mac.o match_bsr.o mount.o parse_bsr.o \
+ pythonsd.o read.o read_record.o record.o \
+ reserve.o scan.o \
+ spool.o status.o stored_conf.o wait.o
+
+# btape
+TAPEOBJS = btape.o block.o butil.o dev.o device.o label.o faketape.o \
+ lock.o ansi_label.o dvd.o ebcdic.o \
+ autochanger.o acquire.o mount.o record.o read_record.o \
+ reserve.o \
+ stored_conf.o match_bsr.o parse_bsr.o scan.o spool.o wait.o
+
+# bls
+BLSOBJS = bls.o block.o butil.o device.o dev.o label.o match_bsr.o faketape.o \
+ ansi_label.o dvd.o ebcdic.o lock.o \
+ autochanger.o acquire.o mount.o parse_bsr.o record.o \
+ read_record.o reserve.o scan.o stored_conf.o spool.o wait.o
+
+# bextract
+BEXTOBJS = bextract.o block.o device.o dev.o label.o record.o faketape.o \
+ ansi_label.o dvd.o ebcdic.o lock.o \
+ autochanger.o acquire.o mount.o match_bsr.o parse_bsr.o butil.o \
+ pythonsd.o read_record.o reserve.o \
+ scan.o stored_conf.o spool.o wait.o
+
+# bscan
+SCNOBJS = bscan.o block.o device.o dev.o label.o faketape.o \
+ ansi_label.o dvd.o ebcdic.o lock.o \
+ autochanger.o acquire.o mount.o record.o match_bsr.o parse_bsr.o \
+ butil.o read_record.o scan.o reserve.o stored_conf.o spool.o wait.o
+
+# bcopy
+COPYOBJS = bcopy.o block.o device.o dev.o label.o faketape.o \
+ ansi_label.o dvd.o ebcdic.o lock.o \
+ autochanger.o acquire.o mount.o record.o match_bsr.o parse_bsr.o \
+ butil.o read_record.o reserve.o \
+ scan.o stored_conf.o spool.o wait.o