Merged silc_1_0_branch to trunk.

[silc.git] / includes / Makefile.ad

diff --git a/includes/Makefile.am b/includes/Makefile.ad
similarity index 65%
rename from includes/Makefile.am
rename to includes/Makefile.ad
index bf47b28ea3ccfe52f902aca8dd292edec774ba39..9abf2d80d494e81242642d5c3e6e220cc09858ad 100644 (file)
--- a/includes/Makefile.am
+++ b/includes/Makefile.ad
@@ -1,14 +1,13 @@
 #
-#  Makefile.am
+#  Makefile.ad
 #
-#  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+#  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 Pekka Riikonen
+#  Copyright (C) 2000 - 2005 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
@@ -18,16 +17,15 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-if SILC_DIST_TOOLKIT
+#ifdef SILC_DIST_TOOLKIT
 include_HEADERS = \
        silcincludes.h \
        silcwin32.h \
        silcepoc.h \
        silcbeos.h \
        silcos2.h \
-       silcversion.h \
-       version_internal.h
-endif
+       silcversion.h
+#endif SILC_DIST_TOOLKIT
 
 EXTRA_DIST = \
        silcincludes.h \
@@ -35,6 +33,5 @@ EXTRA_DIST = \
        silcepoc.h \
        silcbeos.h \
        silcos2.h \
-       silcversion.h \
-       version_internal.h \
-       silcdefs.h.in
+       silcversion.h.in \
+       silcdistdefs.h