Commit 031cf5e8 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Remove autoconf (from branch 'autocruft') 

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

.gitignore

+0 −6
Original line number Diff line number Diff line 
/src/*.o

Makefile

/config.log

/config.status

/src/config.h

/src/feh
 
/src/stamp-h

/configure.lineno

Makefile

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



default:

	@$(MAKE) -C src



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



install-man:

	@echo installing manuals

	@mkdir -p $(man_dir)/man1

	@cp man/feh.1 man/feh-cam.1 $(man_dir)/man1

	@chmod 644 $(man_dir)/man1/feh.1 $(man_dir)/man1/feh-cam.1

	@ln -fs feh-cam.1 $(man_dir)/man1/gen-cam-menu.1



install-doc:

	@echo installing additional docs

	@mkdir -p $(doc_dir)/feh

	@cp AUTHORS ChangeLog README TODO $(doc_dir)/feh

	@chmod 644 $(doc_dir)/feh/AUTHORS $(doc_dir)/feh/ChangeLog \

		$(doc_dir)/feh/README  $(doc_dir)/feh/TODO



install-bin:

	@echo installing executables

	@mkdir -p $(bin_dir)

	@cp src/feh cam/feh-cam cam/gen-cam-menu $(bin_dir)

	@chmod 755 $(bin_dir)/feh $(bin_dir)/feh-cam \

		$(bin_dir)/gen-cam-menu



install-font:

	@echo installing fonts

	@mkdir -p $(font_dir)

	@cp src/ttfonts/black.style src/ttfonts/menu.style \

		src/ttfonts/yudit.ttf $(font_dir)

	@chmod 644 $(font_dir)/black.style $(font_dir)/menu.style \

		$(font_dir)/yudit.ttf



install-img:

	@echo installing images

	@mkdir -p $(image_dir)

	@cp src/about.png src/menubg_aluminium.png src/menubg_aqua.png \

		src/menubg_black.png src/menubg_brushed.png src/menubg_chrome.png \

		src/menubg_default.png src/menubg_pastel.png src/menubg_sky.png \

		src/menubg_wood.png $(image_dir)

	@chmod 644 $(image_dir)/about.png $(image_dir)/menubg_aluminium.png \

		$(image_dir)/menubg_aqua.png $(image_dir)/menubg_black.png \

		$(image_dir)/menubg_brushed.png $(image_dir)/menubg_chrome.png \

		$(image_dir)/menubg_default.png $(image_dir)/menubg_pastel.png \

		$(image_dir)/menubg_sky.png $(image_dir)/menubg_wood.png





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 -rf $(font_dir)

	rm -rf $(image_dir)



clean:

	@$(MAKE) -C src clean



.PHONY: default install uninstall clean

Makefile.am

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
## 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 feh.spec



LDFLAGS           = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib

INCLUDES          = -I/usr/X11R6/include \

$(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I.



man_MANS = feh.1 feh-cam.1 gen-cam-menu.1



docs_DATA = README AUTHORS ChangeLog TODO

docsdir = $(prefix)/doc/feh



EXTRA_DIST = \

feh.spec feh.1 $(docs_DATA)



SUBDIRS = src cam



test:

	(cd src && $(MAKE) test)



testclean:

	(cd src && $(MAKE) testclean)

Makefile.in

deleted100644 → 0
+0 −453
Original line number Diff line number Diff line 
# 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 feh.spec



LDFLAGS = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib

INCLUDES = -I/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I.





man_MANS = feh.1 feh-cam.1 gen-cam-menu.1



docs_DATA = README AUTHORS ChangeLog TODO

docsdir = $(prefix)/doc/feh



EXTRA_DIST =  feh.spec feh.1 $(docs_DATA)





SUBDIRS = src cam

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

CONFIG_HEADER = ./src/config.h

man1dir = $(mandir)/man1

MANS = $(man_MANS)



NROFF = nroff

DATA =  $(docs_DATA)



DIST_COMMON =  README AUTHORS COPYING ChangeLog Makefile.am Makefile.in \

TODO acinclude.m4 aclocal.m4 config.guess config.sub configure \

configure.ac configure.in feh.spec.in install-sh missing mkinstalldirs \

src/config.h.in src/stamp-h.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 Makefile



Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status

	cd $(top_builddir) \

	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status



$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac  acinclude.m4

	cd $(srcdir) && $(ACLOCAL)



config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

	$(SHELL) ./config.status --recheck

$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)

	cd $(srcdir) && $(AUTOCONF)



src/config.h: src/stamp-h

	@if test ! -f $@; then \

		rm -f src/stamp-h; \

		$(MAKE) src/stamp-h; \

	else :; fi

src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status

	cd $(top_builddir) \

	  && CONFIG_FILES= CONFIG_HEADERS=src/config.h \

	     $(SHELL) ./config.status

	@echo timestamp > src/stamp-h 2> /dev/null

$(srcdir)/src/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/src/stamp-h.in

	@if test ! -f $@; then \

		rm -f $(srcdir)/src/stamp-h.in; \

		$(MAKE) $(srcdir)/src/stamp-h.in; \

	else :; fi

$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) 

	cd $(top_srcdir) && $(AUTOHEADER)

	@echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null



mostlyclean-hdr:



clean-hdr:



distclean-hdr:

	-rm -f src/config.h



maintainer-clean-hdr:

feh.spec: $(top_builddir)/config.status feh.spec.in

	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status



install-man1:

	$(mkinstalldirs) $(DESTDIR)$(man1dir)

	@list='$(man1_MANS)'; \

	l2='$(man_MANS)'; for i in $$l2; do \

	  case "$$i" in \

	    *.1*) list="$$list $$i" ;; \

	  esac; \

	done; \

	for i in $$list; do \

	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \

	  else file=$$i; fi; \

	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \

	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \

	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \

	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \

	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \

	done



uninstall-man1:

	@list='$(man1_MANS)'; \

	l2='$(man_MANS)'; for i in $$l2; do \

	  case "$$i" in \

	    *.1*) list="$$list $$i" ;; \

	  esac; \

	done; \

	for i in $$list; do \

	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \

	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \

	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \

	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \

	  rm -f $(DESTDIR)$(man1dir)/$$inst; \

	done

install-man: $(MANS)

	@$(NORMAL_INSTALL)

	$(MAKE) $(AM_MAKEFLAGS) install-man1

uninstall-man:

	@$(NORMAL_UNINSTALL)

	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1



install-docsDATA: $(docs_DATA)

	@$(NORMAL_INSTALL)

	$(mkinstalldirs) $(DESTDIR)$(docsdir)

	@list='$(docs_DATA)'; for p in $$list; do \

	  if test -f $(srcdir)/$$p; then \

	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docsdir)/$$p"; \

	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docsdir)/$$p; \

	  else if test -f $$p; then \

	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docsdir)/$$p"; \

	    $(INSTALL_DATA) $$p $(DESTDIR)$(docsdir)/$$p; \

	  fi; fi; \

	done



uninstall-docsDATA:

	@$(NORMAL_UNINSTALL)

	list='$(docs_DATA)'; for p in $$list; do \

	  rm -f $(DESTDIR)$(docsdir)/$$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)  $(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)$$unique$(LISP)$$tags" \

	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))



mostlyclean-tags:



clean-tags:



distclean-tags:

	-rm -f TAGS ID



maintainer-clean-tags:



distdir = $(PACKAGE)-$(VERSION)

top_distdir = $(distdir)



# This target untars the dist file and tries a VPATH configuration.  Then

# it guarantees that the distribution is self-contained by making another

# tarfile.

distcheck: dist

	-rm -rf $(distdir)

	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz

	mkdir $(distdir)/=build

	mkdir $(distdir)/=inst

	dc_install_base=`cd $(distdir)/=inst && pwd`; \

	cd $(distdir)/=build \

	  && ../configure --srcdir=.. --prefix=$$dc_install_base \

	  && $(MAKE) $(AM_MAKEFLAGS) \

	  && $(MAKE) $(AM_MAKEFLAGS) dvi \

	  && $(MAKE) $(AM_MAKEFLAGS) check \

	  && $(MAKE) $(AM_MAKEFLAGS) install \

	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \

	  && $(MAKE) $(AM_MAKEFLAGS) dist

	-rm -rf $(distdir)

	@banner="$(distdir).tar.gz is ready for distribution"; \

	dashes=`echo "$$banner" | sed s/./=/g`; \

	echo "$$dashes"; \

	echo "$$banner"; \

	echo "$$dashes"

dist: distdir

	-chmod -R a+r $(distdir)

	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)

	-rm -rf $(distdir)

dist-all: distdir

	-chmod -R a+r $(distdir)

	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)

	-rm -rf $(distdir)

distdir: $(DISTFILES)

	-rm -rf $(distdir)

	mkdir $(distdir)

	-chmod 777 $(distdir)

	@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=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \

	      || exit 1; \

	  fi; \

	done

info-am:

info: info-recursive

dvi-am:

dvi: dvi-recursive

check-am: all-am

check: check-recursive

installcheck-am:

installcheck: installcheck-recursive

install-exec-am:

install-exec: install-exec-recursive



install-data-am: install-man install-docsDATA

install-data: install-data-recursive



install-am: all-am

	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

install: install-recursive

uninstall-am: uninstall-man uninstall-docsDATA

uninstall: uninstall-recursive

all-am: Makefile $(MANS) $(DATA)

all-redirect: all-recursive

install-strip:

	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install

installdirs: installdirs-recursive

installdirs-am:

	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(docsdir)





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-tags mostlyclean-generic



mostlyclean: mostlyclean-recursive



clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am



clean: clean-recursive



distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am



distclean: distclean-recursive

	-rm -f config.status



maintainer-clean-am:  maintainer-clean-hdr 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

	-rm -f config.status



.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \

install-man1 uninstall-man1 install-man uninstall-man \

uninstall-docsDATA install-docsDATA 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 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:

	(cd src && $(MAKE) test)



testclean:

	(cd src && $(MAKE) testclean)



# 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:

README

+3 −3
Original line number Diff line number Diff line 
Compile:



$ ./configure

$ make

$ su -c "make install"

$ sudo make install



(Red hat users, use $ ./configure --prefix=/usr)

If compilation does not work or you want to customize stuff (like disable

Xinerama support), edit config.mk first.



What is feh?