From d00bfdcddb324969ea38a78df1842f20aa33d6a7 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 21 Mar 2022 14:08:07 +0100 Subject: [PATCH] buildsys: drop file list in Makefiles just install all files, `make gen` at the top level is responsible for generating the correct files Signed-off-by: Wolfgang Bumiller --- common/pkg/Makefile | 19 +++---------------- pmg-rs/Makefile | 22 +++++----------------- pve-rs/Makefile | 21 +++++---------------- 3 files changed, 13 insertions(+), 49 deletions(-) diff --git a/common/pkg/Makefile b/common/pkg/Makefile index be795c7..8c71a0a 100644 --- a/common/pkg/Makefile +++ b/common/pkg/Makefile @@ -12,28 +12,15 @@ DEB=${PACKAGE}_${DEB_VERSION}_${ARCH}.deb DESTDIR= -PM_DIRS := \ - PVE/RS \ - Proxmox/Lib \ - Proxmox/RS - -PM_FILES := \ - PVE/RS/CalendarEvent.pm \ - Proxmox/Lib/Common.pm \ - Proxmox/RS/CalendarEvent.pm - all: true .PHONY: install install: install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB) - set -e && for i in $(PM_DIRS); do \ - install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB)/$$i; \ - done - set -e && for i in $(PM_FILES); do \ - install -m644 $$i $(DESTDIR)$(PERL_INSTALLVENDORLIB)/$$i; \ - done + find PVE \! -type d -print -exec install -Dm644 '{}' $(DESTDIR)$(PERL_INSTALLVENDORLIB)'/{}' ';' + find Proxmox \! -type d -print -exec install -Dm644 '{}' $(DESTDIR)$(PERL_INSTALLVENDORLIB)'/{}' ';' + rm $(DESTDIR)$(PERL_INSTALLVENDORLIB)'/Proxmox/Lib/template.pm' .PHONY: deb deb: $(DEB) diff --git a/pmg-rs/Makefile b/pmg-rs/Makefile index f1b7cbb..405f6c9 100644 --- a/pmg-rs/Makefile +++ b/pmg-rs/Makefile @@ -14,16 +14,7 @@ DEBS=$(MAIN_DEB) $(DBGSYM_DEB) DESTDIR= -PM_DIRS := \ - Proxmox/Lib \ - PMG/RS/APT - -PM_FILES := \ - Proxmox/Lib/PMG.pm \ - PMG/RS/APT/Repositories.pm \ - PMG/RS/Acme.pm \ - PMG/RS/CSR.pm \ - PMG/RS/TFA.pm +PM_DIR := PMG ifeq ($(BUILD_MODE), release) CARGO_BUILD_ARGS += --release @@ -46,13 +37,10 @@ build: install: target/release/libpmg_rs.so install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORARCH)/auto install -m644 target/release/libpmg_rs.so $(DESTDIR)$(PERL_INSTALLVENDORARCH)/auto/libpmg_rs.so - install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB)/PMG/RS - set -e && for i in $(PM_DIRS); do \ - install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB)/$$i; \ - done - set -e && for i in $(PM_FILES); do \ - install -m644 $$i $(DESTDIR)$(PERL_INSTALLVENDORLIB)/$$i; \ - done + install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB) + install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB)/Proxmox/Lib + install -m644 Proxmox/Lib/PMG.pm $(DESTDIR)$(PERL_INSTALLVENDORLIB)/Proxmox/Lib/PMG.pm + find $(PM_DIR) \! -type d -print -exec install -Dm644 '{}' $(DESTDIR)$(PERL_INSTALLVENDORLIB)'/{}' ';' .PHONY: deb deb: $(MAIN_DEB) diff --git a/pve-rs/Makefile b/pve-rs/Makefile index c2806d8..e22d1bb 100644 --- a/pve-rs/Makefile +++ b/pve-rs/Makefile @@ -15,15 +15,7 @@ DEBS=$(MAIN_DEB) $(DBGSYM_DEB) DESTDIR= -PM_DIRS := \ - Proxmox/Lib \ - PVE/RS/APT - -PM_FILES := \ - Proxmox/Lib/PVE.pm \ - PVE/RS/APT/Repositories.pm \ - PVE/RS/OpenId.pm \ - PVE/RS/TFA.pm +PM_DIR := PVE ifeq ($(BUILD_MODE), release) CARGO_BUILD_ARGS += --release @@ -46,13 +38,10 @@ build: install: target/release/libpve_rs.so install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORARCH)/auto install -m644 target/release/libpve_rs.so $(DESTDIR)$(PERL_INSTALLVENDORARCH)/auto/libpve_rs.so - install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB)/PVE/RS - set -e && for i in $(PM_DIRS); do \ - install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB)/$$i; \ - done - set -e && for i in $(PM_FILES); do \ - install -m644 $$i $(DESTDIR)$(PERL_INSTALLVENDORLIB)/$$i; \ - done + install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB) + install -d -m755 $(DESTDIR)$(PERL_INSTALLVENDORLIB)/Proxmox/Lib + install -m644 Proxmox/Lib/PVE.pm $(DESTDIR)$(PERL_INSTALLVENDORLIB)/Proxmox/Lib/PVE.pm + find $(PM_DIR) \! -type d -print -exec install -Dm644 '{}' $(DESTDIR)$(PERL_INSTALLVENDORLIB)'/{}' ';' .PHONY: deb deb: $(MAIN_DEB)