1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/Makefile.am Thu May 06 13:48:04 2004 +0000
1.3 @@ -0,0 +1,8 @@
1.4 +SUBDIRS = src doc
1.5 +
1.6 +docs:
1.7 + @cd doc \
1.8 + && $(MAKE) $(AM_MAKEFLAGS) clean \
1.9 + && $(MAKE) $(AM_MAKEFLAGS) all
1.10 +
1.11 +.PHONY: docs
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/bootstrap Thu May 06 13:48:04 2004 +0000
2.3 @@ -0,0 +1,4 @@
2.4 +#! /bin/sh
2.5 +aclocal-1.7 \
2.6 +&& automake-1.7 --gnu --add-missing \
2.7 +&& autoconf
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/configure.ac Thu May 06 13:48:04 2004 +0000
3.3 @@ -0,0 +1,29 @@
3.4 +dnl Process this file with autoconf to produce a configure script.
3.5 +AC_INIT([HugoLib], [0.1], [etik-ol@cs.elte.hu], [hugo])
3.6 +AC_CONFIG_AUX_DIR([config])
3.7 +AM_INIT_AUTOMAKE(1.7)
3.8 +AC_CONFIG_SRCDIR([src/hugo/invalid.h])
3.9 +AC_PREREQ(2.57)
3.10 +
3.11 +dnl Checks for programs.
3.12 +AC_PROG_CC
3.13 +AC_PROG_CXX
3.14 +
3.15 +dnl Checks for libraries.
3.16 +
3.17 +dnl Checks for header files.
3.18 +AC_CHECK_HEADERS(limits.h sys/time.h unistd.h)
3.19 +
3.20 +dnl Checks for typedefs, structures, and compiler characteristics.
3.21 +AC_C_CONST
3.22 +AC_C_INLINE
3.23 +AC_TYPE_SIZE_T
3.24 +AC_HEADER_TIME
3.25 +AC_STRUCT_TM
3.26 +
3.27 +dnl Checks for library functions.
3.28 +AC_HEADER_STDC
3.29 +AC_CHECK_FUNCS(gettimeofday)
3.30 +
3.31 +AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile src/hugo/Makefile src/test/Makefile])
3.32 +AC_OUTPUT
4.1 --- a/doc/Doxyfile Thu May 06 13:46:07 2004 +0000
4.2 +++ b/doc/Doxyfile Thu May 06 13:48:04 2004 +0000
4.3 @@ -394,8 +394,8 @@
4.4 INPUT = mainpage.dox \
4.5 maps.dox coding_style.dox \
4.6 groups.dox \
4.7 - ../src/include \
4.8 - ../src/include/skeletons \
4.9 + ../src/hugo \
4.10 + ../src/hugo/skeletons \
4.11 ../src/work/alpar/list_graph.h \
4.12 ../src/work/athos/minlengthpaths.h \
4.13 ../src/work/klao/path.h \
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/doc/Makefile.am Thu May 06 13:48:04 2004 +0000
5.3 @@ -0,0 +1,40 @@
5.4 +## TODO: Doxyfile should be generated from Doxyfile.in by configure. This way
5.5 +## the value of PROJECT_NAME, PROJRCT_NUMBER, PERL_PATH, etc. could be
5.6 +## substituted in configure-time.
5.7 +
5.8 +htmldir = $(datadir)/doc/@PACKAGE@-@VERSION@/html
5.9 +## htmldir = $(pkgdatadir)/doc
5.10 +
5.11 +EXTRA_DIST = Doxyfile html
5.12 +
5.13 +all-local: html/index.html
5.14 +
5.15 +## TODO: 'html/index.html' should depend on the files listed in Doxyfile's
5.16 +## INPUT variable.
5.17 +html/index.html: Doxyfile
5.18 + -rm -rf html
5.19 + doxygen Doxyfile
5.20 +
5.21 +## This is needed to make 'make dist' work even if the 'html' subdirectory
5.22 +## does not exist.
5.23 +html: html/index.html
5.24 +
5.25 +clean-local:
5.26 + -rm -rf html
5.27 +
5.28 +install-data-local: html/index.html
5.29 + @$(NORMAL_INSTALL)
5.30 + $(mkinstalldirs) $(DESTDIR)$(htmldir)
5.31 + @dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.dot $$dir/*.php $$dir/*.idx ; do \
5.32 + f="`echo $$p | sed -e 's|^.*/||'`"; \
5.33 + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f"; \
5.34 + $(INSTALL_DATA) $$p $(DESTDIR)$(htmldir)/$$f; \
5.35 + done
5.36 +
5.37 +uninstall-local: html/index.html
5.38 + @$(NORMAL_UNINSTALL)
5.39 + @dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.dot $$dir/*.php $$dir/*.idx ; do \
5.40 + f="`echo $$p | sed -e 's|^.*/||'`"; \
5.41 + echo " rm -f $(DESTDIR)$(htmldir)/$$f"; \
5.42 + rm -f $(DESTDIR)$(htmldir)/$$f; \
5.43 + done
6.1 --- a/doc/makefile Thu May 06 13:46:07 2004 +0000
6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
6.3 @@ -1,12 +0,0 @@
6.4 -doxy:
6.5 - rm -rf html latex
6.6 - doxygen Doxyfile
6.7 -
6.8 -texi: etikol.texi flf-graph.texi
6.9 - makeinfo etikol.texi&&makeinfo --html etikol.texi&&texi2pdf etikol.texi
6.10 -
6.11 -texi-html: etikol.texi flf-graph.texi
6.12 - makeinfo etikol.texi&&makeinfo --html etikol.texi
6.13 -
6.14 -clean:
6.15 - rm -rf html latex
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/src/Makefile.am Thu May 06 13:48:04 2004 +0000
7.3 @@ -0,0 +1,1 @@
7.4 +SUBDIRS = hugo test
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
8.2 +++ b/src/hugo/Makefile.am Thu May 06 13:48:04 2004 +0000
8.3 @@ -0,0 +1,12 @@
8.4 +pkginclude_HEADERS = \
8.5 + bin_heap.h \
8.6 + dijkstra.h \
8.7 + dimacs.h \
8.8 + error.h \
8.9 + fib_heap.h \
8.10 + invalid.h \
8.11 + maps.h \
8.12 + smart_graph.h \
8.13 + time_measure.h \
8.14 + unionfind.h \
8.15 + xy.h
9.1 --- a/src/hugo/bin_heap.h Thu May 06 13:46:07 2004 +0000
9.2 +++ b/src/hugo/bin_heap.h Thu May 06 13:48:04 2004 +0000
9.3 @@ -58,8 +58,8 @@
9.4 */
9.5
9.6
9.7 -#ifndef BIN_HEAP_HH
9.8 -#define BIN_HEAP_HH
9.9 +#ifndef HUGO_BIN_HEAP_H
9.10 +#define HUGO_BIN_HEAP_H
9.11
9.12 ///\ingroup auxdat
9.13 ///\file
10.1 --- a/src/hugo/dijkstra.h Thu May 06 13:46:07 2004 +0000
10.2 +++ b/src/hugo/dijkstra.h Thu May 06 13:48:04 2004 +0000
10.3 @@ -6,8 +6,8 @@
10.4 ///\file
10.5 ///\brief Dijkstra algorithm.
10.6
10.7 -#include <bin_heap.h>
10.8 -#include <invalid.h>
10.9 +#include <hugo/bin_heap.h>
10.10 +#include <hugo/invalid.h>
10.11
10.12 namespace hugo {
10.13
11.1 --- a/src/hugo/dimacs.h Thu May 06 13:46:07 2004 +0000
11.2 +++ b/src/hugo/dimacs.h Thu May 06 13:48:04 2004 +0000
11.3 @@ -5,7 +5,7 @@
11.4 #include <iostream>
11.5 #include <string>
11.6 #include <vector>
11.7 -#include <maps.h>
11.8 +#include <hugo/maps.h>
11.9
11.10 /// \file
11.11 /// \brief Dimacs file format reader.
12.1 --- a/src/hugo/skeletons/graph.h Thu May 06 13:46:07 2004 +0000
12.2 +++ b/src/hugo/skeletons/graph.h Thu May 06 13:48:04 2004 +0000
12.3 @@ -5,7 +5,7 @@
12.4 ///\file
12.5 ///\brief Declaration of GraphSkeleton.
12.6
12.7 -#include <invalid.h>
12.8 +#include <hugo/invalid.h>
12.9
12.10 /// The namespace of HugoLib
12.11 namespace hugo {
13.1 --- a/src/hugo/smart_graph.h Thu May 06 13:46:07 2004 +0000
13.2 +++ b/src/hugo/smart_graph.h Thu May 06 13:48:04 2004 +0000
13.3 @@ -10,7 +10,7 @@
13.4 #include <vector>
13.5 #include <limits.h>
13.6
13.7 -#include "invalid.h"
13.8 +#include <hugo/invalid.h>
13.9
13.10 namespace hugo {
13.11
14.1 --- a/src/hugo/unionfind.h Thu May 06 13:46:07 2004 +0000
14.2 +++ b/src/hugo/unionfind.h Thu May 06 13:48:04 2004 +0000
14.3 @@ -12,7 +12,7 @@
14.4 #include <utility>
14.5 #include <algorithm>
14.6
14.7 -#include <invalid.h>
14.8 +#include <hugo/invalid.h>
14.9
14.10 namespace hugo {
14.11
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
15.2 +++ b/src/test/Makefile.am Thu May 06 13:48:04 2004 +0000
15.3 @@ -0,0 +1,8 @@
15.4 +AM_CPPFLAGS = -I$(top_srcdir)/src
15.5 +
15.6 +check_PROGRAMS = graph_test
15.7 +
15.8 +TESTS = $(check_PROGRAMS)
15.9 +XFAIL_TESTS =
15.10 +
15.11 +graph_test_SOURCES = graph_test.cc
16.1 --- a/src/test/dijkstra_heap_test.cc Thu May 06 13:46:07 2004 +0000
16.2 +++ b/src/test/dijkstra_heap_test.cc Thu May 06 13:48:04 2004 +0000
16.3 @@ -14,12 +14,12 @@
16.4 #include <iostream>
16.5 #include <math.h>
16.6
16.7 -#include <smart_graph.h>
16.8 -#include <dimacs.h>
16.9 -#include <dijkstra.h>
16.10 -#include <time_measure.h>
16.11 -#include <bin_heap.h>
16.12 -#include <fib_heap.h>
16.13 +#include <hugo/smart_graph.h>
16.14 +#include <hugo/dimacs.h>
16.15 +#include <hugo/dijkstra.h>
16.16 +#include <hugo/time_measure.h>
16.17 +#include <hugo/bin_heap.h>
16.18 +#include <hugo/fib_heap.h>
16.19
16.20 using namespace hugo;
16.21
17.1 --- a/src/test/error_test.cc Thu May 06 13:46:07 2004 +0000
17.2 +++ b/src/test/error_test.cc Thu May 06 13:48:04 2004 +0000
17.3 @@ -1,6 +1,6 @@
17.4 #include <iostream>
17.5
17.6 -#include <error.h>
17.7 +#include <hugo/error.h>
17.8
17.9 using namespace hugo;
17.10 using std::cout;
18.1 --- a/src/test/graph_test.cc Thu May 06 13:46:07 2004 +0000
18.2 +++ b/src/test/graph_test.cc Thu May 06 13:48:04 2004 +0000
18.3 @@ -1,6 +1,6 @@
18.4 #include<iostream>
18.5 -#include<smart_graph.h>
18.6 -#include<skeletons/graph.h>
18.7 +#include<hugo/smart_graph.h>
18.8 +#include<hugo/skeletons/graph.h>
18.9 #include<../work/alpar/list_graph.h>
18.10
18.11 /*
19.1 --- a/src/test/makefile Thu May 06 13:46:07 2004 +0000
19.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
19.3 @@ -1,26 +0,0 @@
19.4 -INCLUDEDIRS ?= -I../include
19.5 -CXXFLAGS += -W -Wall -O3 -ansi -pedantic $(INCLUDEDIRS)
19.6 -#LEDAROOT ?= /ledasrc/LEDA-4.1
19.7 -
19.8 -BINARIES = dijkstra_heap_test unionfind_test error_test
19.9 -
19.10 -ifdef GCCVER
19.11 -CXX := g++-$(GCCVER)
19.12 -else
19.13 -CXX := $(shell type -p g++-3.3 || type -p g++-3.2 || type -p g++-3.0 || type -p g++-3 || echo g++)
19.14 -endif
19.15 -
19.16 -CC=$(CXX)
19.17 -
19.18 -all: $(BINARIES)
19.19 -
19.20 -.depend dep depend:
19.21 - $(CXX) $(INCLUDEDIRS) -M $(BINARIES:=.cc) > .depend
19.22 -
19.23 -makefile: .depend
19.24 -sinclude .depend
19.25 -
19.26 -clean:
19.27 - $(RM) *.o $(BINARIES) .depend
19.28 -
19.29 -.PHONY: all clean dep depend
20.1 --- a/src/test/unionfind_test.cc Thu May 06 13:46:07 2004 +0000
20.2 +++ b/src/test/unionfind_test.cc Thu May 06 13:48:04 2004 +0000
20.3 @@ -1,7 +1,7 @@
20.4 #include <iostream>
20.5
20.6 -#include <maps.h>
20.7 -#include <unionfind.h>
20.8 +#include <hugo/maps.h>
20.9 +#include <hugo/unionfind.h>
20.10
20.11 using namespace hugo;
20.12 using namespace std;
21.1 --- a/src/test/xy_test.cc Thu May 06 13:46:07 2004 +0000
21.2 +++ b/src/test/xy_test.cc Thu May 06 13:48:04 2004 +0000
21.3 @@ -1,4 +1,4 @@
21.4 -#include <xy.h>
21.5 +#include <hugo/xy.h>
21.6 #include <iostream>
21.7 using namespace std;
21.8 using namespace hugo;
22.1 --- a/src/work/alpar/list_graph.h Thu May 06 13:46:07 2004 +0000
22.2 +++ b/src/work/alpar/list_graph.h Thu May 06 13:48:04 2004 +0000
22.3 @@ -10,7 +10,7 @@
22.4 #include <vector>
22.5 #include <limits.h>
22.6
22.7 -#include "invalid.h"
22.8 +#include <hugo/invalid.h>
22.9
22.10 namespace hugo {
22.11