aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.hgignore1
-rw-r--r--Makefile.am2
-rw-r--r--config.h.in21
-rw-r--r--configure.in41
-rw-r--r--d_size.h24
-rw-r--r--dlib/Makefile.am3
-rw-r--r--dpi/Makefile.am39
-rw-r--r--dpid/Makefile.am12
-rw-r--r--dpip/Makefile.am3
-rw-r--r--dw/Makefile.am3
-rw-r--r--lout/Makefile.am3
-rw-r--r--src/IO/Makefile.am4
-rw-r--r--test/Makefile.am130
13 files changed, 170 insertions, 116 deletions
diff --git a/.hgignore b/.hgignore
index bd66a7b6..35198815 100644
--- a/.hgignore
+++ b/.hgignore
@@ -16,7 +16,6 @@
^missing$
(^|/)tags$
^src/dillo$
-^d_size\.h$
^dpi/[^/]*\.dpi$
^dpid/dpid$
^dpid/dpidc$
diff --git a/Makefile.am b/Makefile.am
index 52acc2af..3cc1a098 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
SUBDIRS = lout dw dlib dpip src doc dpid dpi test
-EXTRA_DIST = Doxyfile dillorc install-dpi-local
+EXTRA_DIST = Doxyfile dillorc install-dpi-local d_size.h
sysconf_DATA = dillorc
diff --git a/config.h.in b/config.h.in
index 54501855..371d658f 100644
--- a/config.h.in
+++ b/config.h.in
@@ -105,8 +105,29 @@
/* Version number of package */
#undef VERSION
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+ <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+ #define below would cause a syntax error. */
+#undef _UINT32_T
+
/* Use char pointers for newer libiconv */
#undef inbuf_t
+/* Define to the type of a signed integer type of width exactly 16 bits if
+ such a type exists and the standard includes do not define it. */
+#undef int16_t
+
+/* Define to the type of a signed integer type of width exactly 32 bits if
+ such a type exists and the standard includes do not define it. */
+#undef int32_t
+
/* Define the real type of socklen_t */
#undef socklen_t
+
+/* Define to the type of an unsigned integer type of width exactly 16 bits if
+ such a type exists and the standard includes do not define it. */
+#undef uint16_t
+
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+ such a type exists and the standard includes do not define it. */
+#undef uint32_t
diff --git a/configure.in b/configure.in
index d75d5c03..e5d0786a 100644
--- a/configure.in
+++ b/configure.in
@@ -53,43 +53,10 @@ AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(void *)
-case 2 in
-$ac_cv_sizeof_short) gint16=short;;
-$ac_cv_sizeof_int) gint16=int;;
-esac
-case 4 in
-$ac_cv_sizeof_short) gint32=short;;
-$ac_cv_sizeof_int) gint32=int;;
-$ac_cv_sizeof_long) gint32=long;;
-esac
-
-cat >d_size.h <<_______EOF
-#ifndef __D_SIZE_H__
-#define __D_SIZE_H__
-
-
-#include "config.h"
-
-#if HAVE_STDINT_H == 0
-#include <stdint.h>
-#elif defined(HAVE_INTTYPES_H)
-#include <inttypes.h>
-#else
-typedef signed $gint16 int16_t;
-typedef unsigned $gint16 uint16_t;
-typedef signed $gint32 int32_t;
-typedef unsigned $gint32 uint32_t;
-#endif
-typedef unsigned char uchar_t;
-typedef unsigned short ushort_t;
-typedef unsigned long ulong_t;
-typedef unsigned int uint_t;
-typedef unsigned char bool_t;
-
-
-#endif /* __D_SIZE_H__ */
-_______EOF
-
+AC_TYPE_INT16_T
+AC_TYPE_UINT16_T
+AC_TYPE_INT32_T
+AC_TYPE_UINT32_T
dnl --------------------------------------
dnl Check whether to add /usr/local or not
diff --git a/d_size.h b/d_size.h
new file mode 100644
index 00000000..2e2019e7
--- /dev/null
+++ b/d_size.h
@@ -0,0 +1,24 @@
+#ifndef __D_SIZE_H__
+#define __D_SIZE_H__
+
+
+#include "config.h"
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#else
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#else
+/* config.h defines {int,uint}*_t */
+#endif /* HAVE_INTTYPES_H */
+#endif /*HAVE_STDINT_H */
+
+typedef unsigned char uchar_t;
+typedef unsigned short ushort_t;
+typedef unsigned long ulong_t;
+typedef unsigned int uint_t;
+typedef unsigned char bool_t;
+
+
+#endif /* __D_SIZE_H__ */
diff --git a/dlib/Makefile.am b/dlib/Makefile.am
index 378cd785..a45d6a57 100644
--- a/dlib/Makefile.am
+++ b/dlib/Makefile.am
@@ -1,3 +1,6 @@
+AM_CPPFLAGS = \
+ -I$(top_srcdir)
+
noinst_LIBRARIES = libDlib.a
libDlib_a_SOURCES = \
diff --git a/dpi/Makefile.am b/dpi/Makefile.am
index 34e07483..ade14854 100644
--- a/dpi/Makefile.am
+++ b/dpi/Makefile.am
@@ -1,3 +1,6 @@
+AM_CPPFLAGS = \
+ -I$(top_srcdir)
+
bookmarksdir = $(libdir)/dillo/dpi/bookmarks
downloadsdir = $(libdir)/dillo/dpi/downloads
ftpdir = $(libdir)/dillo/dpi/ftp
@@ -17,15 +20,33 @@ file_PROGRAMS = file.dpi
cookies_PROGRAMS = cookies.dpi
datauri_PROGRAMS = datauri.filter.dpi
-bookmarks_dpi_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a
-downloads_dpi_LDADD = @LIBFLTK_LIBS@ ../dpip/libDpip.a ../dlib/libDlib.a
-ftp_filter_dpi_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a
-https_filter_dpi_LDADD = @LIBSSL_LIBS@ ../dpip/libDpip.a ../dlib/libDlib.a
-hello_filter_dpi_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a
-vsource_filter_dpi_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a
-file_dpi_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a
-cookies_dpi_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a
-datauri_filter_dpi_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a
+bookmarks_dpi_LDADD = \
+ $(top_builddir)/dpip/libDpip.a \
+ $(top_builddir)/dlib/libDlib.a
+downloads_dpi_LDADD = @LIBFLTK_LIBS@ \
+ $(top_builddir)/dpip/libDpip.a \
+ $(top_builddir)/dlib/libDlib.a
+ftp_filter_dpi_LDADD = \
+ $(top_builddir)/dpip/libDpip.a \
+ $(top_builddir)/dlib/libDlib.a
+https_filter_dpi_LDADD = @LIBSSL_LIBS@ \
+ $(top_builddir)/dpip/libDpip.a \
+ $(top_builddir)/dlib/libDlib.a
+hello_filter_dpi_LDADD = \
+ $(top_builddir)/dpip/libDpip.a \
+ $(top_builddir)/dlib/libDlib.a
+vsource_filter_dpi_LDADD = \
+ $(top_builddir)/dpip/libDpip.a \
+ $(top_builddir)/dlib/libDlib.a
+file_dpi_LDADD = \
+ $(top_builddir)/dpip/libDpip.a \
+ $(top_builddir)/dlib/libDlib.a
+cookies_dpi_LDADD = \
+ $(top_builddir)/dpip/libDpip.a \
+ $(top_builddir)/dlib/libDlib.a
+datauri_filter_dpi_LDADD = \
+ $(top_builddir)/dpip/libDpip.a \
+ $(top_builddir)/dlib/libDlib.a
downloads_dpi_CXXFLAGS = @LIBFLTK_CXXFLAGS@
diff --git a/dpid/Makefile.am b/dpid/Makefile.am
index 2b81a98a..a59fa083 100644
--- a/dpid/Makefile.am
+++ b/dpid/Makefile.am
@@ -1,8 +1,14 @@
-AM_CPPFLAGS=-DDPIDRC_SYS='"$(sysconfdir)/dpidrc"'
+AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -DDPIDRC_SYS='"$(sysconfdir)/dpidrc"'
bin_PROGRAMS = dpid dpidc
-dpid_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a
-dpidc_LDADD = ../dpip/libDpip.a ../dlib/libDlib.a
+dpid_LDADD = \
+ $(top_builddir)/dpip/libDpip.a \
+ $(top_builddir)/dlib/libDlib.a
+dpidc_LDADD = \
+ $(top_builddir)/dpip/libDpip.a \
+ $(top_builddir)/dlib/libDlib.a
EXTRA_DIST = dpidrc.in
diff --git a/dpip/Makefile.am b/dpip/Makefile.am
index 099ac7d4..e88da0a1 100644
--- a/dpip/Makefile.am
+++ b/dpip/Makefile.am
@@ -1,3 +1,6 @@
+AM_CPPFLAGS = \
+ -I$(top_srcdir)
+
noinst_LIBRARIES = libDpip.a
libDpip_a_SOURCES = \
diff --git a/dw/Makefile.am b/dw/Makefile.am
index 7150fce9..3014b35d 100644
--- a/dw/Makefile.am
+++ b/dw/Makefile.am
@@ -1,3 +1,6 @@
+AM_CPPFLAGS = \
+ -I$(top_srcdir)
+
noinst_LIBRARIES = \
libDw-core.a \
libDw-fltk.a \
diff --git a/lout/Makefile.am b/lout/Makefile.am
index 5a246708..a3f947db 100644
--- a/lout/Makefile.am
+++ b/lout/Makefile.am
@@ -1,3 +1,6 @@
+AM_CPPFLAGS = \
+ -I$(top_srcdir)
+
noinst_LIBRARIES = liblout.a
liblout_a_SOURCES = \
diff --git a/src/IO/Makefile.am b/src/IO/Makefile.am
index b168073c..c889dae8 100644
--- a/src/IO/Makefile.am
+++ b/src/IO/Makefile.am
@@ -1,4 +1,6 @@
-AM_CPPFLAGS=-DDILLO_BINDIR='"$(bindir)/"'
+AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ -DDILLO_BINDIR='"$(bindir)/"'
AM_CFLAGS = @LIBFLTK_CFLAGS@
AM_CXXFLAGS = @LIBFLTK_CXXFLAGS@
diff --git a/test/Makefile.am b/test/Makefile.am
index 42dd7547..a0a23c6a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS = \
+ -I$(top_srcdir)
AM_CFLAGS = @LIBFLTK_CFLAGS@
AM_CXXFLAGS = @LIBFLTK_CXXFLAGS@
@@ -23,115 +25,115 @@ noinst_PROGRAMS = \
dw_anchors_test_SOURCES = dw_anchors_test.cc
dw_anchors_test_LDADD = \
- ../dw/libDw-widgets.a \
- ../dw/libDw-fltk.a \
- ../dw/libDw-core.a \
- ../lout/liblout.a \
+ $(top_builddir)/dw/libDw-widgets.a \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
@LIBFLTK_LIBS@
dw_example_SOURCES = dw_example.cc
dw_example_LDADD = \
- ../dw/libDw-widgets.a \
- ../dw/libDw-fltk.a \
- ../dw/libDw-core.a \
- ../lout/liblout.a \
+ $(top_builddir)/dw/libDw-widgets.a \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
@LIBFLTK_LIBS@
dw_find_test_SOURCES = dw_find_test.cc
dw_find_test_LDADD = \
- ../dw/libDw-widgets.a \
- ../dw/libDw-fltk.a \
- ../dw/libDw-core.a \
- ../lout/liblout.a \
+ $(top_builddir)/dw/libDw-widgets.a \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
@LIBFLTK_LIBS@
dw_links_SOURCES = dw_links.cc
dw_links_LDADD = \
- ../dw/libDw-widgets.a \
- ../dw/libDw-fltk.a \
- ../dw/libDw-core.a \
- ../lout/liblout.a \
+ $(top_builddir)/dw/libDw-widgets.a \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
@LIBFLTK_LIBS@
dw_links2_SOURCES = dw_links2.cc
dw_links2_LDADD = \
- ../dw/libDw-widgets.a \
- ../dw/libDw-fltk.a \
- ../dw/libDw-core.a \
- ../lout/liblout.a \
+ $(top_builddir)/dw/libDw-widgets.a \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
@LIBFLTK_LIBS@
dw_images_simple_SOURCES = dw_images_simple.cc
dw_images_simple_LDADD = \
- ../dw/libDw-widgets.a \
- ../dw/libDw-fltk.a \
- ../dw/libDw-core.a \
- ../lout/liblout.a \
+ $(top_builddir)/dw/libDw-widgets.a \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
@LIBFLTK_LIBS@
dw_images_scaled_SOURCES = dw_images_scaled.cc
dw_images_scaled_LDADD = \
- ../dw/libDw-widgets.a \
- ../dw/libDw-fltk.a \
- ../dw/libDw-core.a \
- ../lout/liblout.a \
+ $(top_builddir)/dw/libDw-widgets.a \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
@LIBFLTK_LIBS@
dw_images_scaled2_SOURCES = dw_images_scaled2.cc
dw_images_scaled2_LDADD = \
- ../dw/libDw-widgets.a \
- ../dw/libDw-fltk.a \
- ../dw/libDw-core.a \
- ../lout/liblout.a \
+ $(top_builddir)/dw/libDw-widgets.a \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
@LIBFLTK_LIBS@
dw_lists_SOURCES = dw_lists.cc
dw_lists_LDADD = \
- ../dw/libDw-widgets.a \
- ../dw/libDw-fltk.a \
- ../dw/libDw-core.a \
- ../lout/liblout.a \
+ $(top_builddir)/dw/libDw-widgets.a \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
@LIBFLTK_LIBS@
dw_table_aligned_SOURCES = dw_table_aligned.cc
dw_table_aligned_LDADD = \
- ../dw/libDw-widgets.a \
- ../dw/libDw-fltk.a \
- ../dw/libDw-core.a \
- ../lout/liblout.a \
+ $(top_builddir)/dw/libDw-widgets.a \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
@LIBFLTK_LIBS@
dw_table_SOURCES = dw_table.cc
dw_table_LDADD = \
- ../dw/libDw-widgets.a \
- ../dw/libDw-fltk.a \
- ../dw/libDw-core.a \
- ../lout/liblout.a \
+ $(top_builddir)/dw/libDw-widgets.a \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
@LIBFLTK_LIBS@
dw_border_test_SOURCES = dw_border_test.cc
dw_border_test_LDADD = \
- ../dw/libDw-widgets.a \
- ../dw/libDw-fltk.a \
- ../dw/libDw-core.a \
- ../lout/liblout.a \
+ $(top_builddir)/dw/libDw-widgets.a \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
@LIBFLTK_LIBS@
dw_imgbuf_mem_test_SOURCES = dw_imgbuf_mem_test.cc
dw_imgbuf_mem_test_LDADD = \
- ../dw/libDw-widgets.a \
- ../dw/libDw-fltk.a \
- ../dw/libDw-core.a \
- ../lout/liblout.a \
+ $(top_builddir)/dw/libDw-widgets.a \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
@LIBFLTK_LIBS@
dw_resource_test_SOURCES = dw_resource_test.cc
dw_resource_test_LDADD = \
- ../dw/libDw-widgets.a \
- ../dw/libDw-fltk.a \
- ../dw/libDw-core.a \
- ../lout/liblout.a \
+ $(top_builddir)/dw/libDw-widgets.a \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
@LIBFLTK_LIBS@
dw_ui_test_SOURCES = \
@@ -139,10 +141,10 @@ dw_ui_test_SOURCES = \
form.cc \
form.hh
dw_ui_test_LDADD = \
- ../dw/libDw-widgets.a \
- ../dw/libDw-fltk.a \
- ../dw/libDw-core.a \
- ../lout/liblout.a \
+ $(top_builddir)/dw/libDw-widgets.a \
+ $(top_builddir)/dw/libDw-fltk.a \
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a \
@LIBFLTK_LIBS@
fltk_browser_SOURCES = fltk_browser.cc
@@ -150,10 +152,10 @@ fltk_browser_LDADD = @LIBFLTK_LIBS@
shapes_SOURCES = shapes.cc
shapes_LDADD = \
- ../dw/libDw-core.a \
- ../lout/liblout.a
+ $(top_builddir)/dw/libDw-core.a \
+ $(top_builddir)/lout/liblout.a
cookies_SOURCES = cookies.c
cookies_LDADD = \
- ../dpip/libDpip.a \
- ../dlib/libDlib.a
+ $(top_builddir)/dpip/libDpip.a \
+ $(top_builddir)/dlib/libDlib.a