Commit e1121600 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

add a desktop file (closes #98)

parent f104f321

.gitignore

+1 −0
Original line number Diff line number Diff line 
/share/applications/*.desktop

/src/deps.mk

/src/*.o

/src/*.inc

ChangeLog

+2 −0
Original line number Diff line number Diff line 
git HEAD

    * Add --keep-zoom-vp option to keep zoom and offsets when switching

      images (patch by sdaau). Press 'k' to toggle it.

    * Add --sort mtime option (patch by guns)

    * Add a desktop file (installed to share/applications/feh.desktop)



Mon, 24 Dec 2012 15:45:54 +0100  Daniel Friesel <derf+feh@finalrewind.org>

Makefile

+15 −3
Original line number Diff line number Diff line 
include config.mk



all: build-src build-man

all: build-src build-man build-applications



build-src:

	@${MAKE} -C src
@@ -8,6 +8,9 @@ build-src: 
build-man:

	@${MAKE} -C man



build-applications:

	@${MAKE} -C share/applications



test: all

	@PACKAGE=${PACKAGE} prove test
@@ -16,7 +19,7 @@ test-x11: all 
	prove test/feh-bg.i



install: install-man install-doc install-bin install-font install-img

install: install-examples

install: install-examples install-applications



install-man:

	@echo installing manuals to ${man_dir}
@@ -57,12 +60,19 @@ install-examples: 
	@cp examples/* ${example_dir}

	@chmod 644 ${example_dir}/*



install-applications:

	@echo installing desktop file to ${desktop_dir}

	@mkdir -p ${desktop_dir}

	@cp share/applications/feh.desktop ${desktop_dir}

	@chmod 644 ${desktop_dir}/feh.desktop





uninstall:

	rm -f ${man_dir}/man1/feh.1 ${man_dir}/man1/feh-cam.1

	rm -f ${man_dir}/man1/gen-cam-menu.1

	rm -rf ${doc_dir}

	rm -f ${bin_dir}/feh ${bin_dir}/feh-cam ${bin_dir}/gen-cam-menu

	rm -f ${desktop_dir}/feh.desktop

	rm -rf ${font_dir}

	rm -rf ${image_dir}
@@ -86,6 +96,8 @@ disttest: dist 
clean:

	@${MAKE} -C src clean

	@${MAKE} -C man clean

	@${MAKE} -C share/applications clean



.PHONY: all test test-x11 install uninstall clean install-man install-doc \

	install-bin install-font install-img install-examples dist
 
	install-bin install-font install-img install-examples \

	install-applications dist

config.mk

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ doc_dir = ${main_dir}/share/doc/feh 
image_dir = ${main_dir}/share/feh/images

font_dir = ${main_dir}/share/feh/fonts

example_dir = ${main_dir}/share/doc/feh/examples

desktop_dir = ${main_dir}/share/applications



# default CFLAGS

CFLAGS ?= -g -O2

share/applications/Makefile

0 → 100644
+24 −0
Original line number Diff line number Diff line 
include ../../config.mk



SOURCES = ${shell echo *.pre}

TARGETS = ${SOURCES:.pre=.desktop}



all: ${TARGETS}



.pre.desktop:

	sed \

	-e 's/\$$VERSION\$$/${VERSION}/g' \

	-e 's/\$$DATE\$$/'"$$(date '+%B %d, %Y')"/g \

	-e 's/\$$MAN_CURL\$$/${MAN_CURL}/' \

	-e 's/\$$MAN_DEBUG\$$/${MAN_DEBUG}/' \

	-e 's/\$$MAN_EXIF\$$/${MAN_EXIF}/' \

	-e 's/\$$MAN_XINERAMA\$$/${MAN_XINERAMA}/' \

	-e 's:\$$IMAGEDIR\$$:${image_dir}:' \

	< ${@:.desktop=.pre} > $@



clean:

	rm -f *.1



.SUFFIXES: .pre .desktop



.PHONY: clean