Merged silc_1_0_branch to trunk.

[silc.git] / apps / silcd / Makefile.am

diff --git a/apps/silcd/Makefile.am b/apps/silcd/Makefile.am
index 0e3802222371f0c9d9bcf9576f6ba04aae11cfa1..d166e1fb1fd97906c0a210a2e53eb874036c00f0 100644 (file)
--- a/apps/silcd/Makefile.am
+++ b/apps/silcd/Makefile.am
@@ -1,14 +1,13 @@
 #
 #  Makefile.am
 #
-#  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
@@ -23,27 +22,23 @@ sbin_PROGRAMS = silcd
 silcd_SOURCES = \
        protocol.c \
        route.c \
-       server.c \
        packet_send.c \
        packet_receive.c \
        idlist.c \
        command.c \
        command_reply.c \
+       silcd.c \
+       server.c \
+       server_util.c \
+       server_backup.c \
        serverconfig.c \
+       server_query.c \
        serverid.c \
-       silcd.c \
        server_version.c
-silcd_DEPENDENCIES = ../lib/libsilc.a
 
-if SILC_BUILD_GMP
-LDADD = -L. -L.. -L../lib -lsilc
-else
-LDADD = -L. -L.. -L../lib -lsilc -L/usr/lib -L/usr/local/lib -lgmp
-endif
+LIBS = $(SILC_COMMON_LIBS) -lsilc
+LDADD =
 
 EXTRA_DIST = *.h
 
-INCLUDES = -I. -I.. -I../lib/silccore -I../lib/silccrypt \
-       -I../lib/silcmath -I../lib/silcske -I../lib/silcsim \
-       -I../includes -I../lib/silcutil \
-       -I../lib/silcmath/gmp -I../lib/trq
+include $(top_srcdir)/Makefile.defines.in