X-Git-Url: http://git.silcnet.org/gitweb/?p=crypto.git;a=blobdiff_plain;f=Makefile.defines.in;h=aa790daeaaf90d34f0b6278f7b7a83b913caee4c;hp=09a647597fcf8c8a2c08b1d9b51289892271c7f0;hb=HEAD;hpb=2b141e92fbffee3b69fa1618da5609c139b79292

diff --git a/Makefile.defines.in b/Makefile.defines.in
index 09a64759..aa790dae 100644
--- a/Makefile.defines.in
+++ b/Makefile.defines.in
@@ -1,14 +1,13 @@
 #
-#  Makefile.defines.in
+#  Makefile.defines.pre
 #
-#  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+#  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 2001 Pekka Riikonen
+#  Copyright (C) 2001 - 2008 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.
+#  the Free Software Foundation; version 2 of the License.
 #
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,47 +18,30 @@
 #
 # 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.in).  Also this file may be included
+# in any external project that is included in the SILC source tree.
 #
 # Add following to your Makefile.am:
 #
-# include $(top_srcdir)/Makefile.defines
+# include $(top_srcdir)/Makefile.defines.in
 #
-
-#
-# Generic definitions
+# All packages in the SILC source tree that include the Makefile.defines.in
+# must also include the following two lines in their configure.in file.
 #
-silc_top_srcdir = @SILC_TOP_SRCDIR@
-
+# INCLUDE_DEFINES_INT="include \$(top_srcdir)/Makefile.defines_int"
+# AC_SUBST(INCLUDE_DEFINES_INT)
 #
-# Common libraries that are linked against the created executable
+# (See the Makefile.defines_int.pre for all different definitions but DO NOT
+#  directly include that file!)
 #
-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_INT@
 
 #
 # INCLUDE defines
 #
-INCLUDES = $(ADD_INCLUDES) \
+INCLUDES = $(ADD_INCLUDES) $(SILC_CFLAGS) -DHAVE_CRYPTODEFS_H \
 	-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
+	-I$(silc_top_srcdir) $(SILC_LIB_INCLUDES) \
+	-I$(silc_top_srcdir)/includes \
+	-I$(silc_top_srcdir)/doc