Remove autoconf (from branch 'autocruft')

Use config.mk for configuration, both GNU make and FreeBSD make are supported.

10 files changed, 84 insertions, 792 deletions

diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..5fdc498
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,84 @@
+include ../config.mk
+
+OBJECTS = collage.o events.o feh_png.o filelist.o getopt.o getopt1.o imlib.o \
+	index.o ipc.o keyevents.o list.o main.o md5.o menu.o multiwindow.o \
+	options.o slideshow.o support.o thumbnail.o timers.o utils.o winwidget.o
+
+feh: $(OBJECTS)
+	$(CC) $(CFLAGS) -o $@ $(OBJECTS) $(LDFLAGS)
+
+
+
+.c.o:
+	$(CC) $(CFLAGS) -c $<
+
+collage.o: collage.c feh.h getopt.h structs.h menu.h ipc.h \
+	utils.h debug.h winwidget.h filelist.h options.h
+
+events.o: events.c feh.h getopt.h structs.h menu.h ipc.h \
+	utils.h debug.h filelist.h winwidget.h timers.h options.h \
+	events.h thumbnail.h
+
+feh_png.o: feh_png.c feh_png.h feh.h getopt.h structs.h menu.h \
+	ipc.h utils.h debug.h
+
+filelist.o: filelist.c feh.h getopt.h structs.h menu.h ipc.h \
+	utils.h debug.h filelist.h options.h
+
+getopt.o: getopt.c
+
+getopt1.o: getopt1.c getopt.h
+
+imlib.o: imlib.c feh.h getopt.h structs.h menu.h ipc.h utils.h \
+	debug.h filelist.h winwidget.h options.h
+
+index.o: index.c feh.h getopt.h structs.h menu.h ipc.h utils.h \
+	debug.h filelist.h winwidget.h options.h
+
+ipc.o: ipc.c feh.h getopt.h structs.h menu.h ipc.h utils.h \
+	debug.h options.h
+
+keyevents.o: keyevents.c feh.h getopt.h structs.h menu.h ipc.h \
+	utils.h debug.h thumbnail.h filelist.h winwidget.h options.h
+
+list.o: list.c feh.h getopt.h structs.h menu.h ipc.h utils.h \
+	debug.h filelist.h options.h
+
+main.o: main.c feh.h getopt.h structs.h menu.h ipc.h utils.h \
+	debug.h filelist.h winwidget.h timers.h options.h events.h \
+	support.h
+
+md5.o: md5.c md5.h
+
+menu.o: menu.c feh.h getopt.h structs.h menu.h ipc.h utils.h \
+	debug.h support.h thumbnail.h filelist.h winwidget.h options.h
+
+multiwindow.o: multiwindow.c feh.h getopt.h structs.h menu.h \
+	ipc.h utils.h debug.h winwidget.h timers.h filelist.h options.h
+
+options.o: options.c feh.h getopt.h structs.h menu.h ipc.h \
+	utils.h debug.h filelist.h options.h
+
+slideshow.o: slideshow.c feh.h getopt.h structs.h menu.h ipc.h \
+	utils.h debug.h filelist.h timers.h winwidget.h options.h
+
+support.o: support.c feh.h getopt.h structs.h menu.h ipc.h \
+	utils.h debug.h filelist.h options.h support.h
+
+thumbnail.o: thumbnail.c feh.h getopt.h structs.h menu.h ipc.h \
+	utils.h debug.h filelist.h winwidget.h options.h thumbnail.h \
+	md5.h feh_png.h
+
+timers.o: timers.c feh.h getopt.h structs.h menu.h ipc.h \
+	utils.h debug.h options.h timers.h
+
+utils.o: utils.c feh.h getopt.h structs.h menu.h ipc.h utils.h \
+	debug.h options.h
+
+winwidget.o: winwidget.c feh.h getopt.h structs.h menu.h ipc.h \
+	utils.h debug.h filelist.h winwidget.h options.h
+
+clean:
+	rm -f feh *.o
+
+.PHONY: clean
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index b87f0e0..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-# A list of all the files in the current directory which can be regenerated
-MAINTAINERCLEANFILES = Makefile.in				
-
-INCLUDES          = -I/usr/X11R6/include $(X_CFLAGS) \
-                    -I$(prefix)/include -I$(includedir) \
-                    -I. -I$(top_srcdir)/src \
-                    -I/usr/local/include/libpng \
-                    -DPREFIX=\""$(prefix)"\" \
-                    @IMLIB_CFLAGS@ @GIBLIB_CFLAGS@
-LIBOBJS = @LIBOBJS@
-
-bin_PROGRAMS      = feh
-feh_SOURCES       = main.c getopt.c getopt1.c getopt.h feh.h \
-options.c options.h winwidget.c winwidget.h menu.c menu.h structs.h \
-filelist.c filelist.h multiwindow.c imlib.c index.c slideshow.c \
-utils.c utils.h keyevents.c timers.c timers.h list.c collage.c debug.h \
-events.c events.h support.c support.h \
-thumbnail.c thumbnail.h ipc.c ipc.h md5.c md5.h feh_png.c feh_png.h
-
-feh_LDADD         = -lX11 -lz -lpng @IMLIB_LIBS@ @GIBLIB_LIBS@
-
-images_DATA = about.png menubg_default.png menubg_sky.png \
-menubg_chrome.png menubg_brushed.png \
-menubg_pastel.png menubg_aluminium.png menubg_aqua.png \
-menubg_wood.png menubg_black.png
-
-imagesdir=$(prefix)/share/feh/images
-EXTRA_DIST = $(images_DATA)
-
-test:
-	@for i in test[0-9]* ; do \
-	  if test -x $$i ; then \
-	    echo "Executing test script $$i..." ; \
-	    ./$$i ; \
-	  fi ; \
-	done
-
-testclean:
-	-rm -f _test*.jpg
-
-SUBDIRS = ttfonts
diff --git a/src/Makefile.in b/src/Makefile.in
deleted file mode 100644
index 1476066..0000000
--- a/src/Makefile.in
+++ /dev/null
@@ -1,495 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# A list of all the files in the current directory which can be regenerated
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-CC = @CC@
-GIBLIB_CFLAGS = @GIBLIB_CFLAGS@
-GIBLIB_LIBS = @GIBLIB_LIBS@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_CONFIG = @GTK_CONFIG@
-GTK_LIBS = @GTK_LIBS@
-HAVE_LIB = @HAVE_LIB@
-HAVE_XINERAMA = @HAVE_XINERAMA@
-IMLIB_CFLAGS = @IMLIB_CFLAGS@
-IMLIB_LIBS = @IMLIB_LIBS@
-LIB = @LIB@
-LTLIB = @LTLIB@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-PACKAGE = @PACKAGE@
-UP = @UP@
-VERSION = @VERSION@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-
-MAINTAINERCLEANFILES = Makefile.in				
-
-LDFLAGS = -L/usr/X11R6/lib -L/usr/local/lib -lz -lpng
-INCLUDES = -I/usr/X11R6/include $(X_CFLAGS)                     -I$(prefix)/include -I$(includedir)                     -I. -I$(top_srcdir)/src                     -I/usr/local/include/libpng                     -DPREFIX=\""$(prefix)"\"                     @IMLIB_CFLAGS@ @GIBLIB_CFLAGS@
-
-LIBOBJS = @LIBOBJS@
-
-bin_PROGRAMS = feh
-feh_SOURCES = main.c getopt.c getopt1.c getopt.h feh.h options.c options.h winwidget.c winwidget.h menu.c menu.h structs.h filelist.c filelist.h multiwindow.c imlib.c index.c slideshow.c utils.c utils.h keyevents.c timers.c timers.h list.c collage.c debug.h events.c events.h support.c support.h thumbnail.c thumbnail.h ipc.c ipc.h md5.c md5.h feh_png.c feh_png.h
-
-
-feh_LDADD = -lX11 -lz -lpng @IMLIB_LIBS@ @GIBLIB_LIBS@
-
-images_DATA = about.png menubg_default.png menubg_sky.png menubg_chrome.png menubg_brushed.png menubg_pastel.png menubg_aluminium.png menubg_aqua.png menubg_wood.png menubg_black.png
-
-
-imagesdir = $(prefix)/share/feh/images
-EXTRA_DIST = $(images_DATA)
-
-SUBDIRS = ttfonts
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = 
-PROGRAMS =  $(bin_PROGRAMS)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I.
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-feh_OBJECTS =  main.o getopt.o getopt1.o options.o winwidget.o menu.o \
-filelist.o multiwindow.o imlib.o index.o slideshow.o utils.o \
-keyevents.o timers.o list.o collage.o events.o support.o \
-thumbnail.o ipc.o md5.o feh_png.o
-feh_DEPENDENCIES = 
-feh_LDFLAGS = 
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(images_DATA)
-
-DIST_COMMON =  ./stamp-h.in Makefile.am Makefile.in config.h.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-SOURCES = $(feh_SOURCES)
-OBJECTS = $(feh_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-config.h: stamp-h
-	@if test ! -f $@; then \
-		rm -f stamp-h; \
-		$(MAKE) stamp-h; \
-	else :; fi
-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=src/config.h \
-	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
-	@if test ! -f $@; then \
-		rm -f $(srcdir)/stamp-h.in; \
-		$(MAKE) $(srcdir)/stamp-h.in; \
-	else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-	-rm -f config.h
-
-maintainer-clean-hdr:
-
-mostlyclean-binPROGRAMS:
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
-distclean-binPROGRAMS:
-
-maintainer-clean-binPROGRAMS:
-
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-	done
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-feh: $(feh_OBJECTS) $(feh_DEPENDENCIES)
-	@rm -f feh
-	$(LINK) $(feh_LDFLAGS) $(feh_OBJECTS) $(feh_LDADD) $(LIBS)
-
-install-imagesDATA: $(images_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(imagesdir)
-	@list='$(images_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(imagesdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(imagesdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(imagesdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(imagesdir)/$$p; \
-	  fi; fi; \
-	done
-
-uninstall-imagesDATA:
-	@$(NORMAL_UNINSTALL)
-	list='$(images_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(imagesdir)/$$p; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-collage.o: collage.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h winwidget.h filelist.h options.h
-events.o: events.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h filelist.h winwidget.h timers.h options.h \
-	events.h thumbnail.h
-feh_png.o: feh_png.c feh_png.h feh.h config.h getopt.h structs.h menu.h \
-	ipc.h utils.h debug.h
-filelist.o: filelist.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h filelist.h options.h
-getopt.o: getopt.c config.h
-getopt1.o: getopt1.c config.h getopt.h
-imlib.o: imlib.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
-	debug.h filelist.h winwidget.h options.h
-index.o: index.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
-	debug.h filelist.h winwidget.h options.h
-ipc.o: ipc.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
-	debug.h options.h
-keyevents.o: keyevents.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h thumbnail.h filelist.h winwidget.h options.h
-list.o: list.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
-	debug.h filelist.h options.h
-main.o: main.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
-	debug.h filelist.h winwidget.h timers.h options.h events.h \
-	support.h
-md5.o: md5.c md5.h
-menu.o: menu.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
-	debug.h support.h thumbnail.h filelist.h winwidget.h options.h
-multiwindow.o: multiwindow.c feh.h config.h getopt.h structs.h menu.h \
-	ipc.h utils.h debug.h winwidget.h timers.h filelist.h options.h
-options.o: options.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h filelist.h options.h
-slideshow.o: slideshow.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h filelist.h timers.h winwidget.h options.h
-support.o: support.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h filelist.h options.h support.h
-thumbnail.o: thumbnail.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h filelist.h winwidget.h options.h thumbnail.h \
-	md5.h feh_png.h
-timers.o: timers.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h options.h timers.h
-utils.o: utils.c feh.h config.h getopt.h structs.h menu.h ipc.h utils.h \
-	debug.h options.h
-winwidget.o: winwidget.c feh.h config.h getopt.h structs.h menu.h ipc.h \
-	utils.h debug.h filelist.h winwidget.h options.h
-
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am: all-am
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-all-recursive-am: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-install-exec-am: install-binPROGRAMS
-install-exec: install-exec-recursive
-
-install-data-am: install-imagesDATA
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am: uninstall-binPROGRAMS uninstall-imagesDATA
-uninstall: uninstall-recursive
-all-am: Makefile $(PROGRAMS) $(DATA) config.h
-all-redirect: all-recursive-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(imagesdir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \
-		mostlyclean-compile mostlyclean-tags \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-tags \
-		clean-generic mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \
-		distclean-tags distclean-generic clean-am
-
-distclean: distclean-recursive
-
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile uninstall-imagesDATA install-imagesDATA \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-test:
-	@for i in test[0-9]* ; do \
-	  if test -x $$i ; then \
-	    echo "Executing test script $$i..." ; \
-	    ./$$i ; \
-	  fi ; \
-	done
-
-testclean:
-	-rm -f _test*.jpg
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/config.h.in b/src/config.h.in
deleted file mode 100644
index 042d07c..0000000
--- a/src/config.h.in
+++ /dev/null
@@ -1,16 +0,0 @@
-/* src/config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the `Xinerama' library (-lXinerama). */
-#undef HAVE_LIBXINERAMA
-
-/* Name of package */
-#undef PACKAGE
-
-/* Version number of package */
-#undef VERSION
-
-/* Define if using the dmalloc debugging malloc package */
-#undef WITH_DMALLOC
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
diff --git a/src/feh.h b/src/feh.h
index c9a6c86..25b7398 100644
--- a/src/feh.h
+++ b/src/feh.h
@@ -26,8 +26,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef FEH_H
 #define FEH_H
 
-#include "config.h"
-
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
diff --git a/src/getopt.c b/src/getopt.c
index 5a8bb6c..d212b3a 100644
--- a/src/getopt.c
+++ b/src/getopt.c
@@ -27,10 +27,6 @@
 #define _NO_PROTO
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #if !defined (__STDC__) || !__STDC__
 /* This is a separate conditional since some stdc systems
    reject `defined (const)'.  */
diff --git a/src/getopt1.c b/src/getopt1.c
index dd74680..5a5c483 100644
--- a/src/getopt1.c
+++ b/src/getopt1.c
@@ -17,10 +17,6 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "getopt.h"
 
 #if !defined (__STDC__) || !__STDC__
diff --git a/src/stamp-h.in b/src/stamp-h.in
deleted file mode 100644
index 9788f70..0000000
--- a/src/stamp-h.in
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/src/ttfonts/Makefile.am b/src/ttfonts/Makefile.am
deleted file mode 100644
index 7df955a..0000000
--- a/src/ttfonts/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AUTOMAKE_OPTIONS = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
-MAINTAINERCLEANFILES = Makefile.in				
-
-testfonts_DATA = \
-menu.style black.style yudit.ttf
-
-testfontsdir=$(prefix)/share/feh/fonts
-
-EXTRA_DIST = $(testfonts_DATA)
diff --git a/src/ttfonts/Makefile.in b/src/ttfonts/Makefile.in
deleted file mode 100644
index ae93e14..0000000
--- a/src/ttfonts/Makefile.in
+++ /dev/null
@@ -1,216 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-CC = @CC@
-GIBLIB_CFLAGS = @GIBLIB_CFLAGS@
-GIBLIB_LIBS = @GIBLIB_LIBS@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_CONFIG = @GTK_CONFIG@
-GTK_LIBS = @GTK_LIBS@
-HAVE_LIB = @HAVE_LIB@
-HAVE_XINERAMA = @HAVE_XINERAMA@
-IMLIB_CFLAGS = @IMLIB_CFLAGS@
-IMLIB_LIBS = @IMLIB_LIBS@
-LIB = @LIB@
-LTLIB = @LTLIB@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-PACKAGE = @PACKAGE@
-UP = @UP@
-VERSION = @VERSION@
-XINERAMA_LIBS = @XINERAMA_LIBS@
-
-AUTOMAKE_OPTIONS = 1.4 foreign
-
-# A list of all the files in the current directory which can be regenerated
-MAINTAINERCLEANFILES = Makefile.in				
-
-testfonts_DATA =  menu.style black.style yudit.ttf
-
-
-testfontsdir = $(prefix)/share/feh/fonts
-
-EXTRA_DIST = $(testfonts_DATA)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../src/config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(testfonts_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/ttfonts/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-install-testfontsDATA: $(testfonts_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(testfontsdir)
-	@list='$(testfonts_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(testfontsdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(testfontsdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(testfontsdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(testfontsdir)/$$p; \
-	  fi; fi; \
-	done
-
-uninstall-testfontsDATA:
-	@$(NORMAL_UNINSTALL)
-	list='$(testfonts_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(testfontsdir)/$$p; \
-	done
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src/ttfonts
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-testfontsDATA
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-testfontsDATA
-uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(testfontsdir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-generic clean-am
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: uninstall-testfontsDATA install-testfontsDATA tags distdir \
-info-am info dvi-am dvi check check-am installcheck-am installcheck \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT: