Removed references to lib/silcutil/epoc, fixed a bug in configure.ad.

[silc.git] / lib / silcutil / Makefile.ad

diff --git a/lib/silcutil/Makefile.ad b/lib/silcutil/Makefile.ad
index b685a75fa96d3d9b62a762d995f0c3be8a1675f4..6f9e446a5130b985a25421ccde29f06e077c7ea4 100644 (file)
--- a/lib/silcutil/Makefile.ad
+++ b/lib/silcutil/Makefile.ad
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 2007 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
@@ -20,24 +20,18 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 if SILC_WIN32
 SUBDIRS=win32
 else
-if SILC_SYMBIAN
-SUBDIRS=symbian
+if SILC_BEOS
+SUBDIRS=beos
+else
+if SILC_OS2
+SUBDIRS=os2
 else
 SUBDIRS=unix
 endif
 endif
+endif
 
-#ifdef SILC_DIST_TOOLKIT
-DIST_SUBDIRS=win32 symbian unix
-#else !SILC_DIST_TOOLKIT
-#ifdef SILC_DIST_CLIENT
-DIST_SUBDIRS=win32 unix
-#else !SILC_DIST_CLIENT
-#ifdef SILC_DIST_SERVER
-DIST_SUBDIRS=unix
-#endif SILC_DIST_SERVER
-#endif SILC_DIST_CLIENT
-#endif SILC_DIST_TOOLKIT
+DIST_SUBDIRS=win32 beos os2 unix
 
 #ifdef SILC_DIST_TOOLKIT
 SILC_DIST_SOURCE = stacktrace.c
@@ -48,27 +42,23 @@ noinst_LTLIBRARIES = libsilcutil.la
 
 libsilcutil_la_SOURCES = \
        $(SILC_DIST_SOURCE) \
-       silcbuffmt.c    \
-       silcconfig.c    \
-       silclog.c       \
-       silcmemory.c    \
-       silcnet.c       \
-       silcschedule.c  \
-       silcfileutil.c  \
-       silcstrutil.c   \
-       silcutil.c      \
+       silcbuffmt.c \
+       silcconfig.c \
+       silclog.c \
+       silcmemory.c \
+       silcnet.c \
+       silcschedule.c \
+       silcfileutil.c \
+       silcstrutil.c \
+       silcutil.c \
        silchashtable.c \
-       silcutf8.c      \
-       silcstringprep.c \
-       silcstream.c    \
-       silcfdstream.c  \
-       silcsocketstream.c \
-       silcfsm.c       \
-       silcasync.c     \
-       silctime.c      \
+       silcsockconn.c  \
+       silcprotocol.c  \
+       silcvcard.c     \
+       silcapputil.c   \
        silcmime.c      \
-       silcstack.c     \
-       silcsnprintf.c
+       silcutf8.c      \
+       silcstringprep.c
 
 #ifdef SILC_DIST_TOOLKIT
 include_HEADERS =      \
@@ -81,35 +71,22 @@ include_HEADERS =   \
        silclog_i.h     \
        silcmemory.h    \
        silcmutex.h     \
-       silcatomic.h    \
-       silccond.h      \
        silcnet.h       \
-       silcnet_i.h     \
        silcschedule.h  \
-       silcschedule_i.h \
+       silcsockconn.h  \
+       silcprotocol.h  \
        silcthread.h    \
        silclist.h      \
        silcdlist.h     \
        silcfileutil.h  \
        silcutil.h      \
        silcstrutil.h   \
-       silcutf8.h      \
-       silcstringprep.h \
-       silctypes.h     \
-       silcstream.h    \
-       silcfdstream.h \
-       silcsocketstream.h \
-       silcsocketstream_i.h \
-       silcfsm.h       \
-       silcfsm_i.h     \
-       silctime.h      \
+       silcvcard.h     \
+       silcapputil.h   \
        silcmime.h      \
-       silcmime_i.h    \
-       silcasync.h     \
-       silcasync_i.h   \
-       silcstack.h     \
-       silcstack_i.h   \
-       silcsnprintf.h
+       silcutf8.h      \
+       silcstringprep.h        \
+       silctypes.h
 
 SILC_EXTRA_DIST = tests
 #endif SILC_DIST_TOOLKIT