projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged silc_1_0_branch to trunk.
[silc.git]
/
lib
/
contrib
/
Makefile.am
diff --git
a/lib/contrib/Makefile.am
b/lib/contrib/Makefile.am
index 78f02843efde0666653762b9c9bffa722fd6c04d..74faaf72f5c3c2496684e4d6f0337fa34ea2aab5 100644
(file)
--- a/
lib/contrib/Makefile.am
+++ b/
lib/contrib/Makefile.am
@@
-1,14
+1,13
@@
#
# Makefile.am
#
#
# 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
#
# 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
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-18,17
+17,28
@@
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
-noinst_LIBRARIES = libcontrib.a
+noinst_LTLIBRARIES = libcontrib.la
+
+if HAVE_GETOPT_LONG
+GETOPT =
+else
+GETOPT = getopt.c getopt1.c
+endif
+
+if HAVE_REGEX
+REGEX =
+else
+REGEX = regex.c
+endif
+
+STRINGPREP = nfkc.c rfc3454.c stringprep.c
if SILC_WIN32
if SILC_WIN32
-libcontrib_
a_SOURCES =
+libcontrib_
la_SOURCES = $(STRINGPREP)
else
else
-libcontrib_a_SOURCES = \
- getopt.c \
- getopt1.c \
- regex.c
+libcontrib_la_SOURCES = $(STRINGPREP) $(GETOPT) $(REGEX)
endif
endif
-EXTRA_DIST = *.h
+EXTRA_DIST = *.
c *.
h
include $(top_srcdir)/Makefile.defines.in
include $(top_srcdir)/Makefile.defines.in