Remove commented out code.

[geeqie.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c3c646c..610c55a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,9 @@
 ## Process this file with automake to produce Makefile.in.
 
-SUBDIRS = src po doc
-DIST_SUBDIRS = src po doc
+include $(top_srcdir)/aminclude.am
+
+SUBDIRS = src po doc plugins
+DIST_SUBDIRS = src po doc plugins
 
 man_MANS = geeqie.1
 
@@ -9,7 +11,9 @@ readmedir = @readmedir@
 readme_DATA = README COPYING ChangeLog TODO README.lirc
 
 desktopdir = $(datadir)/applications
-desktop_DATA = geeqie.desktop
+desktop_in_files = geeqie.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
 
 icondir = $(datadir)/pixmaps
 icon_DATA = geeqie.png
@@ -17,11 +21,13 @@ icon_DATA = geeqie.png
 EXTRA_DIST = \
        $(readme_DATA)  \
        $(desktop_DATA) \
+       $(desktop_in_files)     \
        $(icon_DATA)    \
        geeqie.spec.in  \
-       geeqie.1
+       geeqie.1        \
+       doxygen.conf
 
 dist-hook: geeqie.spec
        cp $(top_builddir)/geeqie.spec $(distdir)
 
-
+DISTCLEANFILES = config.report