[X2Go-Commits] [x2gokdriveclient] 18/26: Makefile: adapt to this package.
git-admin at x2go.org
git-admin at x2go.org
Fri Feb 24 17:17:35 CET 2023
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gokdriveclient.
commit b8b9cc87e89f861b41202f35808ba6dc81bbd5c6
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Feb 24 16:11:40 2023 +0100
Makefile: adapt to this package.
---
Makefile | 70 ++++++++++++++++----------------------------------------
debian/changelog | 1 +
2 files changed, 21 insertions(+), 50 deletions(-)
diff --git a/Makefile b/Makefile
index a6dc732..4a0c0ba 100755
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,13 @@
TOP_DIR=$(CURDIR)
CLIENT_DIR=$(TOP_DIR)/client_build
-CLIENT_BINARY=$(CLIENT_DIR)/x2goclient
+CLIENT_BINARY=$(CLIENT_DIR)/x2gokdriveclient
SHELL=/bin/bash
-# Default to Qt 4.
-# We'll change this to Qt 5 as soon as Qt-4-based platforms go EOL.
-QT_VERSION ?= 4
+# Default to Qt 5.
+# We'll change this to Qt 6 as soon as Qt-5-based platforms go EOL.
+QT_VERSION ?= 5
INSTALL_DIR ?= install -d -o root -g root -m 755
INSTALL_FILE ?= install -o root -g root -m 644
@@ -24,13 +24,13 @@ ETCDIR ?= /etc/x2go
BINDIR ?= $(PREFIX)/bin
SHAREDIR ?= $(PREFIX)/share
MANDIR ?= $(SHAREDIR)/man
-ifeq ($(QT_VERSION),4)
- QMAKE_BINARY ?= qmake-qt4
- LRELEASE_BINARY ?= lrelease-qt4
+ifeq ($(QT_VERSION),5)
+ QMAKE_BINARY ?= qmake
+ LRELEASE_BINARY ?= lrelease
else
- ifeq ($(QT_VERSION),5)
- QMAKE_BINARY ?= qmake
- LRELEASE_BINARY ?= lrelease
+ ifeq ($(QT_VERSION),6)
+ QMAKE_BINARY ?= qmake-qt6
+ LRELEASE_BINARY ?= lrelease-qt6
else
$(error Unsupported Qt version "$(QT_VERSION)" passed.)
endif
@@ -80,8 +80,8 @@ build: build_man
$(MAKE) build_client
build_client:
- $(LRELEASE_BINARY) x2goclient.pro
- mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" QMAKE_LIBS="${LIBS}" $(QMAKE_OPTS) ../x2goclient.pro
+ $(LRELEASE_BINARY) x2gokdriveclient.pro
+ mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" QMAKE_LIBS="${LIBS}" $(QMAKE_OPTS) ../x2gokdriveclient.pro
cd $(CLIENT_DIR) && $(MAKE)
build_man:
@@ -92,9 +92,9 @@ clean: clean_client clean_man
find . -maxdepth 3 -name 'moc_*.cpp' -exec rm -vf {} + -type f
find . -maxdepth 3 -name 'ui_*.h' -exec rm -vf {} + -type f
find . -maxdepth 3 -name 'qrc_*.cpp' -exec rm -vf {} + -type f
- find . -maxdepth 3 -name 'x2goclient_*.qm' -exec rm -vf {} + -type f
- rm -f x2goclient
- rm -f x2goclient.tag
+ find . -maxdepth 3 -name 'x2gokdriveclient_*.qm' -exec rm -vf {} + -type f
+ rm -f x2gokdriveclient
+ rm -f x2gokdriveclient.tag
rm -f res/txt/changelog
rm -f res/txt/git-info
@@ -108,49 +108,19 @@ install: install_client install_man
install_client:
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)/
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/applications
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/mime/packages
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2goclient/icons
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps
- $(INSTALL_PROGRAM) $(CLIENT_DIR)/x2goclient $(DESTDIR)$(BINDIR)/x2goclient
- $(INSTALL_FILE) desktop/x2goclient.desktop $(DESTDIR)$(SHAREDIR)/applications/x2goclient.desktop
- $(INSTALL_FILE) mime/x-x2go.xml $(DESTDIR)$(SHAREDIR)/mime/packages/x-x2go.xml
- $(INSTALL_FILE) res/img/icons/x2goclient.xpm $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.xpm
- $(INSTALL_FILE) res/img/icons/128x128/x2goclient.png $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.png
- $(INSTALL_FILE) res/img/icons/128x128/x2gosession.png $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2gosession.png
- $(INSTALL_FILE) res/img/icons/128x128/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps/x2goclient.png
- $(INSTALL_FILE) res/img/icons/16x16/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/x2goclient.png
- $(INSTALL_FILE) res/img/icons/64x64/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/x2goclient.png
- $(INSTALL_FILE) res/img/icons/32x32/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/32x32/apps/x2goclient.png
+ $(INSTALL_PROGRAM) $(CLIENT_DIR)/x2gokdriveclient $(DESTDIR)$(BINDIR)/x2gokdriveclient
install_man:
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
- $(INSTALL_FILE) man/man1/x2goclient.1 $(DESTDIR)$(MANDIR)/man1/x2goclient.1
- gzip -f $(DESTDIR)$(MANDIR)/man1/x2goclient.1
+ $(INSTALL_FILE) man/man1/x2gokdriveclient.1 $(DESTDIR)$(MANDIR)/man1/x2gokdriveclient.1
+ gzip -f $(DESTDIR)$(MANDIR)/man1/x2gokdriveclient.1
uninstall: uninstall_client uninstall_man
uninstall_client:
- $(RM_FILE) $(BINDIR)/x2goclient
- $(RM_FILE) $(SHAREDIR)/applications/x2goclient.desktop
- $(RM_FILE) $(SHAREDIR)/x2goclient/icons/x2goclient.png
- $(RM_FILE) $(SHAREDIR)/x2goclient/icons/x2goclient.xpm
- $(RM_FILE) $(SHAREDIR)/x2goclient/icons/x2gosession.png
- $(RM_FILE) $(SHAREDIR)/icons/hicolor/128x128/apps/x2goclient.png
- $(RM_FILE) $(SHAREDIR)/icons/hicolor/16x16/apps/x2goclient.png
- $(RM_FILE) $(SHAREDIR)/icons/hicolor/64x64/apps/x2goclient.png
- $(RM_FILE) $(SHAREDIR)/icons/hicolor/32x32/apps/x2goclient.png
- $(RM_DIR) $(SHAREDIR)/applications
- $(RM_DIR) $(SHAREDIR)/x2goclient/icons
- $(RM_DIR) $(SHAREDIR)/icons/hicolor/128x128/apps
- $(RM_DIR) $(SHAREDIR)/icons/hicolor/16x16/apps
- $(RM_DIR) $(SHAREDIR)/icons/hicolor/64x64/apps
- $(RM_DIR) $(SHAREDIR)/icons/hicolor/32x32/apps
+ $(RM_FILE) $(BINDIR)/x2gokdriveclient
uninstall_man:
- $(RM_FILE) $(MANDIR)/man1/x2goclient.1.gz
+ $(RM_FILE) $(MANDIR)/man1/x2gokdriveclient.1.gz
$(RM_DIR) $(MANDIR)/man1
diff --git a/debian/changelog b/debian/changelog
index 0312dfc..98271db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -84,6 +84,7 @@ x2gokdriveclient (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
- Makefile.docupload: copy from X2Go Client.
- Makefile.docupload: adapt to this package.
- res/txt: create and add .placeholder file.
+ - Makefile: adapt to this package.
* debian/rules:
* Let qmake add general Qt {C{,XX},L}FLAGS instead of overriding them.
Especially needed for C++11 support.
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdriveclient.git
More information about the x2go-commits
mailing list