Remove commented out code.

[geeqie.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8a6e380..610c55a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,33 @@
 ## Process this file with automake to produce Makefile.in.
 
-SUBDIRS = src intl po
-DIST_SUBDIRS = src intl po
+include $(top_srcdir)/aminclude.am
 
-EXTRA_DIST = gqview.desktop gqview.png gqview.spec BUGS ChangeLog
+SUBDIRS = src po doc plugins
+DIST_SUBDIRS = src po doc plugins
 
-if HAVE_GNOME
-desktopdir = $(GNOME_DATADIR)/gnome/apps/Graphics
-desktop_DATA = gqview.desktop
+man_MANS = geeqie.1
 
-icondir = $(GNOME_DATADIR)/pixmaps
-icon_DATA = gqview.png
-endif
+readmedir = @readmedir@
+readme_DATA = README COPYING ChangeLog TODO README.lirc
 
+desktopdir = $(datadir)/applications
+desktop_in_files = geeqie.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
+
+icondir = $(datadir)/pixmaps
+icon_DATA = geeqie.png
+
+EXTRA_DIST = \
+       $(readme_DATA)  \
+       $(desktop_DATA) \
+       $(desktop_in_files)     \
+       $(icon_DATA)    \
+       geeqie.spec.in  \
+       geeqie.1        \
+       doxygen.conf
+
+dist-hook: geeqie.spec
+       cp $(top_builddir)/geeqie.spec $(distdir)
+
+DISTCLEANFILES = config.report