updates.

diff --git a/Makefile.defines.in b/Makefile.defines.in
deleted file mode 100644 (file)
index 09a6475..0000000
--- a/Makefile.defines.in
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#  Makefile.defines.in
-#
-#  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
-#
-#  Copyright (C) 2000 - 2001 Pekka Riikonen
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-
-#
-# This file is intended to include all common compilation defines for the
-# SILC source tree.  All Makefile.ams in the SILC source tree are expected
-# to include this file (Makefile.defines).
-#
-# Add following to your Makefile.am:
-#
-# include $(top_srcdir)/Makefile.defines
-#
-
-#
-# Generic definitions
-#
-silc_top_srcdir = @SILC_TOP_SRCDIR@
-
-#
-# Common libraries that are linked against the created executable
-#
-SILC_COMMON_LIBS = @LIBS@ -L$(silc_top_srcdir)/lib -lsilc
-
-#
-# Installation defines
-#
-silc_etcdir = @ETCDIR@
-silc_modulesdir = $(prefix)/@MODULESDIR@
-silc_helpdir = $(prefix)/@HELPDIR@
-silc_docdir = $(prefix)/@DOCDIR@
-silc_logsdir = $(prefix)/@LOGSDIR@
-
-#
-# INCLUDE defines
-#
-INCLUDES = $(ADD_INCLUDES) \
-       -I$(srcdir) -I$(top_srcdir) \
-       -I$(silc_top_srcdir) \
-       -I$(silc_top_srcdir)/lib/silccore \
-       -I$(silc_top_srcdir)/lib/silccrypt \
-        -I$(silc_top_srcdir)/lib/silcmath \
-        -I$(silc_top_srcdir)/lib/silcmath/gmp \
-       -I$(silc_top_srcdir)/lib/silcske \
-       -I$(silc_top_srcdir)/lib/silcsim \
-       -I$(silc_top_srcdir)/lib/silcutil \
-       -I$(silc_top_srcdir)/lib/silcclient \
-       -I$(silc_top_srcdir)/lib/contrib \
-        -I$(silc_top_srcdir)/includes \
-        -I$(silc_top_srcdir)/doc \
-       -I$(silc_top_srcdir)/lib/trq

diff --git a/Makefile.defines.pre b/Makefile.defines.pre
index 87fc6821548ee20e72efe87ab7a7987cc4eba7b3..c5415ccd0de27c1831df97c17113dda2787ddc3b 100644 (file)
--- a/Makefile.defines.pre
+++ b/Makefile.defines.pre
@@ -1,5 +1,5 @@
 #
-#  Makefile.defines.in
+#  Makefile.defines.pre
 #
 #  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
 #
@@ -19,7 +19,8 @@
 #
 # This file is intended to include all common compilation defines for the
 # SILC source tree.  All Makefile.ams in the SILC source tree are expected
-# to include this file (Makefile.defines).
+# to include this file (Makefile.defines).  Also this file may be included
+# in any external project that is included in the SILC source tree.
 #
 # Add following to your Makefile.am:
 #

diff --git a/Makefile.defines_int b/Makefile.defines_int
deleted file mode 100644 (file)
index e634704..0000000
--- a/Makefile.defines_int
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-#  Makefile.defines_int
-#
-#  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
-#
-#  Copyright (C) 2000 - 2001 Pekka Riikonen
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-
-#
-# Internal file for definitions. This is read by Makefile.defines. DO NOT
-# include this file directly to your Makefile.ams.
-#
-
-#
-# Generic definitions
-#
-silc_top_srcdir=/home/silc/silc
-
-#
-# Common libraries that are linked against the created executable
-#
-SILC_COMMON_LIBS= -lncurses -ldl -L$(silc_top_srcdir)/lib -lsilc
-
-#
-# Installation defines
-#
-silc_etcdir=/etc/silc
-silc_modulesdir=$(prefix)/modules
-silc_helpdir=$(prefix)/help
-silc_docdir=$(prefix)/doc
-silc_logsdir=$(prefix)/logs