This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 84fc6e45a19df5b96b7a6e69546718968c36c268
Author: Mihai Moldovan <io...@ionic.de>
Date: Wed Mar 14 02:15:51 2018 +0100
Makefile: remove plugin references.
---
Makefile | 49 ++++---------------------------------------------
debian/changelog | 1 +
2 files changed, 5 insertions(+), 45 deletions(-)
diff --git a/Makefile b/Makefile
index a7656e2..4401ce0 100755
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,6 @@ TOP_DIR=$(CURDIR)
CLIENT_DIR=$(TOP_DIR)/client_build
CLIENT_BINARY=$(CLIENT_DIR)/x2goclient
-PLUGIN_DIR=$(TOP_DIR)/plugin_build
-PLUGIN_BINARY=$(PLUGIN_DIR)/libx2goplugin.so
-
SHELL=/bin/bash
INSTALL_DIR=install -d -o root -g root -m 755
@@ -23,7 +20,6 @@ ETCDIR=/etc/x2go
BINDIR=$(PREFIX)/bin
SHAREDIR=$(PREFIX)/share
MANDIR=$(SHAREDIR)/man
-MOZPLUGDIR=$(PREFIX)/lib/mozilla/plugins
QMAKE_BINARY=qmake-qt4
LRELEASE_BINARY=lrelease-qt4
QMAKE_OPTS=
@@ -66,26 +62,18 @@ MAKEOVERRIDES=
all: build
-build: build_man build_pluginprovider
+build: build_man
$(MAKE) build_client
- $(MAKE) build_plugin
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_OPTS) ../x2goclient.pro
cd $(CLIENT_DIR) && $(MAKE)
-build_plugin:
- $(LRELEASE_BINARY) x2goclient.pro
- mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin
$(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}"
QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}"
$(QMAKE_OPTS) ../x2goclient.pro
- cd $(PLUGIN_DIR) && $(MAKE)
-
-build_pluginprovider:
-
build_man:
${MAKE} -f Makefile.man2html build
-clean: clean_client clean_plugin clean_man clean_pluginprovider
+clean: clean_client clean_man
find . -maxdepth 3 -name '*.o' -exec rm -vf {} + -type f
find . -maxdepth 3 -name 'moc_*.cpp' -exec rm -vf {} + -type f
find . -maxdepth 3 -name 'ui_*.h' -exec rm -vf {} + -type f
@@ -98,15 +86,10 @@ clean: clean_client clean_plugin clean_man
clean_pluginprovider
clean_client:
rm -fr $(CLIENT_DIR)
-clean_plugin:
- rm -fr $(PLUGIN_DIR)
-
-clean_pluginprovider:
-
clean_man:
make -f Makefile.man2html clean
-install: install_client install_plugin install_man install_pluginprovider
+install: install_client install_man
install_client:
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)/
@@ -126,24 +109,13 @@ install_client:
$(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_plugin:
- $(INSTALL_DIR) $(DESTDIR)$(MOZPLUGDIR)/
- $(INSTALL_PROGRAM) $(PLUGIN_DIR)/libx2goplugin.so
$(DESTDIR)$(MOZPLUGDIR)/libx2goplugin.so
-
-install_pluginprovider:
- $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/plugin-provider
- $(INSTALL_FILE) provider/etc/x2goplugin-apache.conf
$(DESTDIR)$(ETCDIR)/x2goplugin-apache.conf
- $(INSTALL_FILE) provider/share/x2goplugin.html
$(DESTDIR)$(ETCDIR)/plugin-provider/x2goplugin.html
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2go/plugin/
- $(INSTALL_SYMLINK)
../../../../$(ETCDIR)/plugin-provider/x2goplugin.html
$(DESTDIR)$(SHAREDIR)/x2go/plugin/x2goplugin.html
-
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
-uninstall: uninstall_client uninstall_plugin uninstall_man
+uninstall: uninstall_client uninstall_man
uninstall_client:
$(RM_FILE) $(BINDIR)/x2goclient
@@ -162,19 +134,6 @@ uninstall_client:
$(RM_DIR) $(SHAREDIR)/icons/hicolor/64x64/apps
$(RM_DIR) $(SHAREDIR)/icons/hicolor/32x32/apps
-uninstall_plugin:
- $(RM_FILE) $(MOZPLUGDIR)/libx2goplugin.so
- $(RM_DIR) $(MOZPLUGDIR)/
-
-uninstall_pluginprovider:
- $(RM_FILE) $(ETCDIR)/x2goplugin-apache.conf
- $(RM_FILE) $(ETCDIR)/plugin-provider/x2goplugin.html
- $(RM_DIR) $(ETCDIR)/plugin-provider
- $(RM_DIR) $(ETCDIR)
- $(RM_FILE) $(SHAREDIR)/x2go/plugin/x2goplugin.html
- $(RM_DIR) $(SHAREDIR)/x2go/plugin/
- $(RM_DIR) $(SHAREDIR)/x2go/
-
uninstall_man:
$(RM_FILE) $(MANDIR)/man1/x2goclient.1.gz
$(RM_DIR) $(MANDIR)/man1
diff --git a/debian/changelog b/debian/changelog
index 8124940..ecf0742 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium
- x2goclient.pro: remove plugin references.
- misc: change http:// to https:// where appropriate, but in actual code
and translation files for now.
+ - Makefile: remove plugin references.
* x2goclient.spec:
- Remove plugin references.
* debian/rules:
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on
/srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits
