diff --git a/Makefile.in b/Makefile.in
index f70a6ab..2603494 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,8 +65,10 @@ CONVERT=@CONVERT@
#---[ Rules ]------------------------------------------------------------------
-%.png: pixmaps/%.svg
+src/pw3270/%.png: src/pw3270/pixmaps/%.svg
ifneq ($(CONVERT),no)
+ @echo " GEN `basename $@`"
+ @$(MKDIR) `dirname $@`
@$(CONVERT) $< --format=png > $@
endif
@@ -131,11 +133,9 @@ ifneq ($(RPMBUILD),no)
@rpmbuild -ts $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz
endif
-$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png
+$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean src/pw3270/$(PACKAGE_NAME).png src/pw3270/$(PACKAGE_NAME)-logo.png
@rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
@$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
- @cp $(PACKAGE_NAME).png $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
- @cp $(PACKAGE_NAME)-logo.png $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
@cp *.m4 $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
@NOCONFIGURE=1 ./autogen.sh $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
@cp configure.ac $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
@@ -154,13 +154,11 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean $(PACKAGE_NAME).png $(PACKAG
@rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
@echo $@
-install: install-sdk install-lib $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png
+install: install-sdk install-lib
@make BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install
@$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
@$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
- @$(INSTALL_DATA) $(PACKAGE_NAME).png $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)
- @$(INSTALL_DATA) $(PACKAGE_NAME)-logo.png $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)
install-lib:
@make BINRLS="../../.bin/Release/lib" -C src/lib3270 install
diff --git a/pixmaps/pw3270-logo.svg b/pixmaps/pw3270-logo.svg
deleted file mode 100644
index e18f0c8..0000000
--- a/pixmaps/pw3270-logo.svg
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-
-
diff --git a/pixmaps/pw3270.svg b/pixmaps/pw3270.svg
deleted file mode 100644
index ebd2f7c..0000000
--- a/pixmaps/pw3270.svg
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-
-
diff --git a/pw3270.spec.in b/pw3270.spec.in
index 3348f83..82b2954 100644
--- a/pw3270.spec.in
+++ b/pw3270.spec.in
@@ -131,6 +131,7 @@ rm -rf $RPM_BUILD_ROOT
# Main application
%dir %{_datadir}/@PACKAGE_NAME@
%dir %{_datadir}/@PACKAGE_NAME@/ui
+%{_datadir}/applications/@PACKAGE_NAME@.desktop
%{_bindir}/@PACKAGE_NAME@
%{_datadir}/@PACKAGE_NAME@/ui/00default.xml
diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in
index d9582cc..6e1cb75 100644
--- a/src/pw3270/Makefile.in
+++ b/src/pw3270/Makefile.in
@@ -35,6 +35,7 @@ exec_prefix=@exec_prefix@
bindir=@bindir@
datarootdir=@datarootdir@
localedir=@localedir@
+desktopdir=$(datarootdir)/applications
DEBDIR ?= debian
EXEEXT=@EXEEXT@
@@ -42,6 +43,7 @@ STRIP=@STRIP@
INSTALL=@INSTALL@
INSTALL_PROGRAM=@INSTALL_PROGRAM@
INSTALL_DATA=@INSTALL_DATA@
+CONVERT=@CONVERT@
#---[ Sources ]----------------------------------------------------------------
@@ -63,16 +65,35 @@ VALGRIND=@VALGRIND@
CFLAGS=@CFLAGS@ @GTK_CFLAGS@ -DDATAROOTDIR=\"$(datarootdir)\" -I../../src/include
LIBS=@LIBS@ @GTK_LIBS@
+#---[ Rules ]------------------------------------------------------------------
+
include ../include/rules.mak
+%.png: pixmaps/%.svg
+ifneq ($(CONVERT),no)
+ @echo " GEN `basename $@`"
+ @$(MKDIR) `dirname $@`
+ @$(CONVERT) $< --format=png > $@
+endif
+
+
#---[ Release targets ]--------------------------------------------------------
Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
@$(STRIP) $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
-install: Release
+install: Release $(PACKAGE_NAME).desktop $(PACKAGE_NAME)-logo.png
@$(MKDIR) $(DESTDIR)$(bindir)
@$(INSTALL_PROGRAM) $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(DESTDIR)$(bindir)
+ @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)
+ @$(INSTALL_DATA) $(PACKAGE_NAME).png $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)
+ @$(INSTALL_DATA) $(PACKAGE_NAME)-logo.png $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)
+ @$(MKDIR) $(DESTDIR)$(desktopdir)
+ @desktop-file-install --mode 644 \
+ --dir $(DESTDIR)/$(desktopdir) \
+ --add-category System \
+ --add-category TerminalEmulator \
+ $(PACKAGE_NAME).desktop
$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): $(foreach SRC, $(basename $(SOURCES)), $(OBJDIR)/Release/$(SRC)$(OBJEXT))
@@ -102,13 +123,27 @@ endif
#---[ Misc targets ]-----------------------------------------------------------
+$(PACKAGE_NAME).desktop: Makefile $(PACKAGE_NAME).png
+ @rm -f $@
+ @echo "[Desktop Entry]" > $@
+ @echo "Encoding=UTF-8" >> $@
+ @echo "GenericName=$(PACKAGE_NAME)" >> $@
+ @echo "Name=3270 Terminal" >> $@
+ @echo "Name[pt_BR]=Terminal 3270" >> $@
+ @echo "Comment=IBM 3270 Terminal emulator" >> $@
+ @echo "Exec=$(bindir)/$(PACKAGE_NAME)@EXEEXT@" >> $@
+ @echo "Icon=$(datarootdir)/$(PACKAGE_NAME)/$(PACKAGE_NAME).png" >> $@
+ @echo "Terminal=false" >> $@
+ @echo "Type=Application" >> $@
+ @echo "StartupNotify=true" >> $@
+
$(DEBDIR)/pw3270.install: Makefile
@echo " GEN `basename $@`"
@$(MKDIR) `dirname $@`
@echo "$(bindir)/@PACKAGE_NAME@" >> $@
- @echo "$(datarootdir)/@PACKAGE_NAME@/ui/00default.xml" >> $@
- @echo "$(datarootdir)/@PACKAGE_NAME@/@PACKAGE_NAME@.png" >> $@
- @echo "$(datarootdir)/@PACKAGE_NAME@/@PACKAGE_NAME@-logo.png" >> $@
+ @echo "$(datarootdir)/$(PACKAGE_NAME)/ui/00default.xml" >> $@
+ @echo "$(datarootdir)/$(PACKAGE_NAME)/$(PACKAGE_NAME).png" >> $@
+ @echo "$(datarootdir)/$(PACKAGE_NAME)/$(PACKAGE_NAME)-logo.png" >> $@
v3270/marshal.h: v3270/genmarshal
@$(MKDIR) `dirname $@`
@@ -125,4 +160,7 @@ clean: clean-common
@rm -fr uiparser/.obj
@rm -fr v3270/.bin
@rm -fr v3270/.obj
+ @rm -f $(PACKAGE_NAME).png
+ @rm -f $(PACKAGE_NAME)-logo.png
+ @rm -f $(PACKAGE_NAME).desktop
diff --git a/src/pw3270/pixmaps/pw3270-logo.svg b/src/pw3270/pixmaps/pw3270-logo.svg
new file mode 100644
index 0000000..e18f0c8
--- /dev/null
+++ b/src/pw3270/pixmaps/pw3270-logo.svg
@@ -0,0 +1,155 @@
+
+
+
+
diff --git a/src/pw3270/pixmaps/pw3270.svg b/src/pw3270/pixmaps/pw3270.svg
new file mode 100644
index 0000000..ebd2f7c
--- /dev/null
+++ b/src/pw3270/pixmaps/pw3270.svg
@@ -0,0 +1,155 @@
+
+
+
+
--
libgit2 0.21.2