cleanup schema function calls

[proxmox-backup.git] / Makefile

diff --git a/Makefile b/Makefile
index b1d1ea93e314015d6aea65867dc97dc99390815e..a29cb2df2d425b8cd2421fdc1b3f26c02dfb5a8c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,15 +38,14 @@ SUBCRATES := \
        pbs-config \
        pbs-datastore \
        pbs-fuse-loop \
-       pbs-runtime \
        proxmox-rest-server \
-       pbs-systemd \
+       proxmox-rrd \
        pbs-tape \
        pbs-tools \
        proxmox-backup-banner \
        proxmox-backup-client \
-       proxmox-backup-debug \
        proxmox-file-restore \
+       proxmox-restore-daemon \
        pxar-bin
 
 ifeq ($(BUILD_MODE), release)
@@ -170,17 +169,12 @@ cargo-build:
 
 $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-cargo-build
 .do-cargo-build:
-       RUSTFLAGS="--cfg openid" $(CARGO) build $(CARGO_BUILD_ARGS) \
-           --bin proxmox-backup-api \
-           --bin proxmox-backup-proxy \
-           --bin proxmox-backup-manager \
-           --bin docgen
        $(CARGO) build $(CARGO_BUILD_ARGS) \
            --package proxmox-backup-banner \
            --bin proxmox-backup-banner \
            --package proxmox-backup-client \
            --bin proxmox-backup-client \
-           --package proxmox-backup-debug \
+           --bin dump-catalog-shell-cli \
            --bin proxmox-backup-debug \
            --package proxmox-file-restore \
            --bin proxmox-file-restore \
@@ -189,11 +183,15 @@ $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-
            --package pbs-tape \
            --bin pmt \
            --bin pmtx \
+           --package proxmox-restore-daemon \
+           --bin proxmox-restore-daemon \
            --package proxmox-backup \
-           --bin dump-catalog-shell-cli \
+           --bin docgen \
+           --bin proxmox-backup-api \
+           --bin proxmox-backup-manager \
+           --bin proxmox-backup-proxy \
            --bin proxmox-daily-update \
            --bin proxmox-file-restore \
-           --bin proxmox-restore-daemon \
            --bin proxmox-tape \
            --bin sg-tape-cmd
        touch "$@"
@@ -223,9 +221,6 @@ install: $(COMPILED_BINS)
            install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/ ;)
        $(MAKE) -C www install
        $(MAKE) -C docs install
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-       $(MAKE) test # HACK, only test now to avoid clobbering build files with wrong config
-endif
 
 .PHONY: upload
 upload: ${SERVER_DEB} ${CLIENT_DEB} ${RESTORE_DEB} ${DOC_DEB} ${DEBUG_DEB}