projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/silc.1.1.branch'
[silc.git]
/
lib
/
Makefile.ad
diff --git
a/lib/Makefile.ad
b/lib/Makefile.ad
index 5bc42fda15e22c75cc5e8a58f7ed80ebc3babe77..9312320c993b48e7c9f6d1c037212257b45f269f 100644
(file)
--- a/
lib/Makefile.ad
+++ b/
lib/Makefile.ad
@@
-19,41
+19,15
@@
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
# SILC Library dirs
SILCLIB_DIRS = \
# SILC Library dirs
SILCLIB_DIRS = \
- contrib \
silccore \
silccore \
- silcutil \
silcapputil \
silcapputil \
-#ifdef SILC_DIST_CRYPTO
- silccrypt \
-#endif SILC_DIST_CRYPTO
-#ifdef SILC_DIST_SKR
- silcskr \
-#endif SILC_DIST_SKR
-#ifdef SILC_DIST_MATH
- silcmath \
-#endif SILC_DIST_MATH
-#ifdef SILC_DIST_SIM
- silcsim \
-#endif SILC_DIST_SIM
-#ifdef SILC_DIST_ASN1
- silcasn1 \
-#endif SILC_DIST_ASN1
silcske \
silcske \
-#ifdef SILC_DIST_HTTP
- silchttp \
-#endif SILC_DIST_HTTP
#ifdef SILC_DIST_SFTP
silcsftp \
#endif SILC_DIST_SFTP
#ifdef SILC_DIST_VCARD
silcvcard \
#endif SILC_DIST_VCARD
#ifdef SILC_DIST_SFTP
silcsftp \
#endif SILC_DIST_SFTP
#ifdef SILC_DIST_VCARD
silcvcard \
#endif SILC_DIST_VCARD
-#ifdef SILC_DIST_ACC
- silcacc \
-#endif SILC_DIST_ACC
-#ifdef SILC_DIST_SSH
- silcssh \
-#endif SILC_DIST_SSH
if SILC_ENABLE_SHARED
if SILC_WIN32
if SILC_ENABLE_SHARED
if SILC_WIN32
@@
-73,11
+47,11
@@
endif
if SILC_WIN32
SILC_LINK_LIBS=$(LIBS)
if SILC_WIN32
SILC_LINK_LIBS=$(LIBS)
-SILCCLIENT_LIBS=$(LIBS) -lsilc
+SILCCLIENT_LI
NK_LI
BS=$(LIBS) -lsilc
SILCSERVER_LIBS=$(LIBS) -lsilc
else
SILC_LINK_LIBS=
SILCSERVER_LIBS=$(LIBS) -lsilc
else
SILC_LINK_LIBS=
-SILCCLIENT_LIBS=
+SILCCLIENT_LI
NK_LI
BS=
SILCSERVER_LIBS=
endif
SILCSERVER_LIBS=
endif
@@
-159,8
+133,8
@@
LIBSILCCLIENT_AGE=@LIBSILCCLIENT_AGE@
libsilcclient.a:
find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs \
libsilcclient.a:
find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs \
- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)
$(SILCCLIENT_LIBS)
\
- $(LIBTOOL_SILCCLIENT_VERSION) \
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
+ $(
SILCCLIENT_LINK_LIBS) $(
LIBTOOL_SILCCLIENT_VERSION) \
$(LIBTOOL_OPTS) -o libsilcclient.la
#endif SILC_DIST_CLIENTLIB
$(LIBTOOL_OPTS) -o libsilcclient.la
#endif SILC_DIST_CLIENTLIB