]> git.proxmox.com Git - proxmox-widget-toolkit.git/commitdiff
add css and image directory to packaging
authorDominik Csapak <d.csapak@proxmox.com>
Wed, 24 Jul 2019 07:21:11 +0000 (09:21 +0200)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Tue, 13 Aug 2019 13:37:26 +0000 (15:37 +0200)
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Makefile
css/Makefile [new file with mode: 0644]
defines.mk [new file with mode: 0644]
images/Makefile [new file with mode: 0644]

index d12a4dacb69fcd9ac62ff8f608c7129612ecb15b..7aa7f73211a0abeb8f541a1b6d78fc4cf63a7b6b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,8 @@
 include /usr/share/dpkg/pkg-info.mk
 
-PACKAGE=proxmox-widget-toolkit
+include defines.mk
 
-BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
-GITVERSION:=$(shell git rev-parse HEAD)
-
-DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
-DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
-
-DESTDIR=
-
-DOCDIR=${DESTDIR}/usr/share/doc/${PACKAGE}
-
-WWWBASEDIR=${DESTDIR}/usr/share/javascript/${PACKAGE}
+SUBDIRS= css images
 
 JSSRC=                                 \
        Utils.js                        \
@@ -58,7 +48,8 @@ JSSRC=                                        \
        node/TimeEdit.js                \
        node/TimeView.js
 
-all:
+all: ${SUBDIRS}
+       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i; done
 
 ${BUILDDIR}:
        rm -rf ${BUILDDIR}
@@ -90,6 +81,7 @@ proxmoxlib.js: ${JSSRC}
 install: proxmoxlib.js
        install -d -m 755 ${WWWBASEDIR}
        install -m 0644 proxmoxlib.js ${WWWBASEDIR}
+       set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
 
 .PHONY: upload
 upload: ${DEB}
diff --git a/css/Makefile b/css/Makefile
new file mode 100644 (file)
index 0000000..36e62ff
--- /dev/null
@@ -0,0 +1,13 @@
+include ../defines.mk
+
+CSS=
+
+all:
+
+.PHONY: install
+install: ${CSS}
+       install -d ${WWWCSSDIR}
+       for i in ${CSS}; do install -m 0755 $$i ${WWWCSSDIR}/$$i; done
+
+.PHONY: clean
+clean:
diff --git a/defines.mk b/defines.mk
new file mode 100644 (file)
index 0000000..99461e1
--- /dev/null
@@ -0,0 +1,15 @@
+PACKAGE=proxmox-widget-toolkit
+
+BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}
+GITVERSION:=$(shell git rev-parse HEAD)
+
+DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+DSC=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}.dsc
+
+DESTDIR=
+
+DOCDIR=${DESTDIR}/usr/share/doc/${PACKAGE}
+
+WWWBASEDIR=${DESTDIR}/usr/share/javascript/${PACKAGE}
+WWWCSSDIR=${WWWBASEDIR}/css
+WWWIMAGESDIR=${WWWBASEDIR}/images
diff --git a/images/Makefile b/images/Makefile
new file mode 100644 (file)
index 0000000..002ad27
--- /dev/null
@@ -0,0 +1,13 @@
+include ../defines.mk
+
+IMAGES=
+
+all:
+
+.PHONY: install
+install: ${IMAGES}
+       install -d ${WWWIMAGESDIR}
+       for i in ${IMAGES}; do install -m 0755 $$i ${WWWIMAGESDIR}/$$i; done
+
+.PHONY: clean
+clean: