diff options
| author | kraxel <kraxel> | 2007-08-31 13:46:27 +0000 |
|---|---|---|
| committer | kraxel <kraxel> | 2007-08-31 13:46:27 +0000 |
| commit | 1a239af5a483bd47565eac17d7ca552f66dd0911 (patch) | |
| tree | 4240bf01ba05887bb78ee9873d3135145d9f19a9 | |
| parent | 6c20a337f9a3930e480a0ee4022fb9fb2ed0b342 (diff) | |
| download | xenwatch-1a239af5a483bd47565eac17d7ca552f66dd0911.tar.gz | |
desktop files, minor fixes.
| -rw-r--r-- | GNUmakefile | 6 | ||||
| -rwxr-xr-x | Testbuild.sh | 1 | ||||
| -rw-r--r-- | mk/Variables.mk | 4 | ||||
| -rw-r--r-- | vnc-client.desktop | 7 | ||||
| -rw-r--r-- | xenlog.desktop | 8 | ||||
| -rw-r--r-- | xenstore.desktop | 8 | ||||
| -rw-r--r-- | xenwatch.desktop | 8 |
7 files changed, 40 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index 6374c90..d86e316 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -78,6 +78,9 @@ CFLAGS += $(call ac_inc_cflags,XENSTORE LIBVIRT AVAHI GTK_VNC) CFLAGS += $(shell test "$(pkglst)" != "" && pkg-config --cflags $(pkglst)) LDLIBS += $(shell test "$(pkglst)" != "" && pkg-config --libs $(pkglst)) +# desktop files +DESKTOP := $(wildcard $(patsubst %,%.desktop,$(TARGETS))) + ######################################################################## # rules @@ -85,9 +88,10 @@ LDLIBS += $(shell test "$(pkglst)" != "" && pkg-config --libs $(pkglst)) build: $(TARGETS) xenscreenrc install: build - $(INSTALL_DIR) -d $(DESTDIR)/etc/xen $(bindir) + $(INSTALL_DIR) -d $(DESTDIR)/etc/xen $(bindir) $(appdir) $(INSTALL_DATA) xenscreenrc $(DESTDIR)/etc/xen $(INSTALL_BINARY) -s $(TARGETS) $(bindir) + $(INSTALL_DATA) $(DESKTOP) $(appdir) clean: -rm -f *.o *~ $(depfiles) diff --git a/Testbuild.sh b/Testbuild.sh index 868b513..21493b3 100755 --- a/Testbuild.sh +++ b/Testbuild.sh @@ -7,6 +7,7 @@ make clean for option in HAVE_GTK HAVE_GTK_VNC HAVE_AVAHI HAVE_XENSTORE HAVE_LIBVIRT; do make $option=no + make $option=no -n install make $option=no clean done diff --git a/mk/Variables.mk b/mk/Variables.mk index 88844b4..fdb1653 100644 --- a/mk/Variables.mk +++ b/mk/Variables.mk @@ -26,8 +26,10 @@ RELTAG := v$(subst .,_,$(VERSION)) CC ?= gcc CXX ?= g++ MOC ?= $(if $(QTDIR),$(QTDIR)/bin/moc,moc) + +STRIP ?= -s INSTALL ?= install -INSTALL_BINARY := $(INSTALL) -s +INSTALL_BINARY := $(INSTALL) $(STRIP) INSTALL_SCRIPT := $(INSTALL) INSTALL_DATA := $(INSTALL) -m 644 INSTALL_DIR := $(INSTALL) -d diff --git a/vnc-client.desktop b/vnc-client.desktop new file mode 100644 index 0000000..96e6e26 --- /dev/null +++ b/vnc-client.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=vnc-client +Exec=vnc-client +Terminal=false +Type=Application +Categories=GTK;System;Network;Utility; diff --git a/xenlog.desktop b/xenlog.desktop new file mode 100644 index 0000000..ba623c3 --- /dev/null +++ b/xenlog.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=xenlog +Comment=xenstore activity logger +Exec=xenlog +Terminal=true +Type=Application +Categories=GTK;System;Utility; diff --git a/xenstore.desktop b/xenstore.desktop new file mode 100644 index 0000000..5ab8fc9 --- /dev/null +++ b/xenstore.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=xenstore +Comment=xenstore browser +Exec=xenstore +Terminal=false +Type=Application +Categories=GTK;System;Utility; diff --git a/xenwatch.desktop b/xenwatch.desktop new file mode 100644 index 0000000..6ca2d77 --- /dev/null +++ b/xenwatch.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=xenwatch +Comment=watch xen domains +Exec=xenstore +Terminal=false +Type=Application +Categories=GTK;System;Utility; |