From 73ae7418f4bf1b111d127b3f801ea5e909f54313 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Mon, 24 Dec 2012 00:14:27 +0100 Subject: [PATCH] added TODO file --- .gitignore | 1 + ChangeLog | 5 ++ Makefile.am | 2 +- Makefile.in | 2 +- TODO | 1 + {man => doc}/sun.1 | 0 src/Makefile.am | 3 +- src/Makefile.in | 134 ++++++--------------------------------------- 8 files changed, 28 insertions(+), 120 deletions(-) create mode 100644 TODO rename {man => doc}/sun.1 (100%) diff --git a/.gitignore b/.gitignore index b86c17c..a690e5c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ # Binaries /src/sun +/src/geonames # Compiled Object files *.slo diff --git a/ChangeLog b/ChangeLog index 90804f8..3cedc8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-12-24 Steffen Vogel + + * removed geonames from make target 'check' + due to problems with chrooted autobuild networks + 2012-12-23 Steffen Vogel * added caching for geonames.org lookups: diff --git a/Makefile.am b/Makefile.am index 21cb7eb..16399d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,4 +2,4 @@ SUBDIRS = src dist_doc_DATA = README -man_MANS = man/sun.1 +man_MANS = doc/sun.1 diff --git a/Makefile.in b/Makefile.in index d554284..2c85224 100644 --- a/Makefile.in +++ b/Makefile.in @@ -248,7 +248,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = src dist_doc_DATA = README -man_MANS = man/sun.1 +man_MANS = doc/sun.1 all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/TODO b/TODO new file mode 100644 index 0000000..087ea40 --- /dev/null +++ b/TODO @@ -0,0 +1 @@ +add muslimic prayer times: http://www.nabkal.de/namazrech.html diff --git a/man/sun.1 b/doc/sun.1 similarity index 100% rename from man/sun.1 rename to doc/sun.1 diff --git a/src/Makefile.am b/src/Makefile.am index 4750f03..5ddadd7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,8 +4,7 @@ sun_SOURCES = sun_main.c sun.c sun_LDADD = -lm if GEONAMES_SUPPORT - TESTS = geonames - check_PROGRAMS = geonames + noinst_PROGRAMS = geonames geonames_SOURCES = geonames_main.c geonames.c geonames_LDADD = $(DEPS_GEONAMES_LIBS) diff --git a/src/Makefile.in b/src/Makefile.in index cbd0647..8fb0d77 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -50,8 +50,7 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : bin_PROGRAMS = sun$(EXEEXT) -@GEONAMES_SUPPORT_TRUE@TESTS = geonames$(EXEEXT) -@GEONAMES_SUPPORT_TRUE@check_PROGRAMS = geonames$(EXEEXT) +@GEONAMES_SUPPORT_TRUE@noinst_PROGRAMS = geonames$(EXEEXT) @GEONAMES_SUPPORT_TRUE@am__append_1 = geonames.c @GEONAMES_SUPPORT_TRUE@am__append_2 = $(DEPS_GEONAMES_LIBS) subdir = src @@ -65,7 +64,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" -PROGRAMS = $(bin_PROGRAMS) +PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am__geonames_SOURCES_DIST = geonames_main.c geonames.c @GEONAMES_SUPPORT_TRUE@am_geonames_OBJECTS = geonames_main.$(OBJEXT) \ @GEONAMES_SUPPORT_TRUE@ geonames.$(OBJEXT) @@ -95,8 +94,6 @@ am__can_run_installinfo = \ esac ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -266,8 +263,8 @@ uninstall-binPROGRAMS: clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -clean-checkPROGRAMS: - -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) +clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) geonames$(EXEEXT): $(geonames_OBJECTS) $(geonames_DEPENDENCIES) $(EXTRA_geonames_DEPENDENCIES) @rm -f geonames$(EXEEXT) $(LINK) $(geonames_OBJECTS) $(geonames_LDADD) $(LIBS) @@ -352,99 +349,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ - fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ - else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ - fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi - distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -476,8 +380,6 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) - $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am all-am: Makefile $(PROGRAMS) installdirs: @@ -516,7 +418,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ +clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \ mostlyclean-am distclean: distclean-am @@ -584,20 +486,20 @@ ps-am: uninstall-am: uninstall-binPROGRAMS -.MAKE: check-am install-am install-strip +.MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-binPROGRAMS clean-checkPROGRAMS clean-generic ctags \ - distclean distclean-compile distclean-generic distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-binPROGRAMS install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ - ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-noinstPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-binPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables.