[X2go-Commits] x2goclient.git - master (branch) updated: 3.0.1.18-52-g3927e84
X2go dev team
git-admin at x2go.org
Wed Jul 20 15:03:20 CEST 2011
The branch, master has been updated
via 3927e84a7269d743d41f968035484d58bf13db95 (commit)
from 9a9cf3cd1a655ce2d13fad4b060c290433991182 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3927e84a7269d743d41f968035484d58bf13db95
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Jul 20 15:03:45 2011 +0200
Re-added Makefile that got lost during commit 6d416e90158c358f28537a63726ed6e37129da4f
-----------------------------------------------------------------------
Summary of changes:
Makefile | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 101 insertions(+), 0 deletions(-)
create mode 100755 Makefile
The diff of changes is:
diff --git a/Makefile b/Makefile
new file mode 100755
index 0000000..cf1f9cc
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,101 @@
+#!/usr/bin/make -f
+
+SRC_DIR=$(CURDIR)
+CLIENT_DIR=$(SRC_DIR)/client_build
+CLIENT_BINARY=$(CLIENT_DIR)/x2goclient
+
+PLUGIN_DIR=$(SRC_DIR)/plugin_build
+PLUGIN_BINARY=$(PLUGIN_DIR)/libx2goplugin.so
+
+SHELL=/bin/bash
+
+INSTALL_DIR=install -d -o root -g root -m 755
+INSTALL_FILE=install -o root -g root -m 644
+INSTALL_PROGRAM=install -o root -g root -m 755
+
+RM_FILE=rm -f
+RM_DIR=rmdir -p --ignore-fail-on-non-empty
+
+DESTDIR=
+PREFIX=/usr/local
+BINDIR=$(PREFIX)/bin
+SHAREDIR=$(PREFIX)/share
+MANDIR=$(SHAREDIR)/man
+MOZPLUGDIR=$(PREFIX)/lib/mozilla/plugins
+
+all: build
+
+build: build_client build_plugin
+
+build_client:
+ mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 ../x2goclient.pro
+ cd $(CLIENT_DIR) && $(MAKE)
+
+build_plugin:
+ mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 ../x2goclient.pro
+ cd $(PLUGIN_DIR) && $(MAKE)
+
+clean: clean_client clean_plugin
+
+clean_client:
+ rm -fr $(CLIENT_DIR)
+
+clean_plugin:
+ rm -fr $(PLUGIN_DIR)
+
+install: install_client install_plugin install_man
+
+install_client:
+ $(INSTALL_DIR) $(DESTDIR)$(BINDIR)/
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/applications
+ $(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) icons/x2goclient.xpm $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.xpm
+ $(INSTALL_FILE) icons/128x128/x2goclient.png $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2goclient.png
+ $(INSTALL_FILE) icons/128x128/x2gosession.png $(DESTDIR)$(SHAREDIR)/x2goclient/icons/x2gosession.png
+ $(INSTALL_FILE) icons/128x128/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/128x128/apps/x2goclient.png
+ $(INSTALL_FILE) icons/16x16/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/16x16/apps/x2goclient.png
+ $(INSTALL_FILE) icons/64x64/x2goclient.png $(DESTDIR)$(SHAREDIR)/icons/hicolor/64x64/apps/x2goclient.png
+ $(INSTALL_FILE) 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_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_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
+
+uninstall_plugin:
+ $(RM_FILE) $(MOZPLUGDIR)/libx2goplugin.so
+ $(RM_DIR) $(MOZPLUGDIR)/
+
+uninstall_man:
+ $(RM_FILE) $(MANDIR)/man1/x2goclient.1.gz
+ $(RM_DIR) $(MANDIR)/man1
hooks/post-receive
--
x2goclient.git (X2go Client)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2go Client).
More information about the x2go-commits
mailing list