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.ad
diff --git
a/lib/contrib/Makefile.am
b/lib/contrib/Makefile.ad
similarity index 72%
rename from
lib/contrib/Makefile.am
rename to
lib/contrib/Makefile.ad
index 74faaf72f5c3c2496684e4d6f0337fa34ea2aab5..60055fd12d60d2400105d34a0d18fbf549fadb6c 100644
(file)
--- a/
lib/contrib/Makefile.am
+++ b/
lib/contrib/Makefile.ad
@@
-19,25
+19,33
@@
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
noinst_LTLIBRARIES = libcontrib.la
noinst_LTLIBRARIES = libcontrib.la
-if HAVE_GETOPT_LONG
-GETOPT =
-else
-GETOPT = getopt.c getopt1.c
-endif
-
if HAVE_REGEX
REGEX =
else
if HAVE_REGEX
REGEX =
else
-REGEX = regex.c
+REGEX = regex
pr
.c
endif
STRINGPREP = nfkc.c rfc3454.c stringprep.c
if SILC_WIN32
endif
STRINGPREP = nfkc.c rfc3454.c stringprep.c
if SILC_WIN32
-libcontrib_la_SOURCES = $(STRINGPREP)
+libcontrib_la_SOURCES = getopti.c $(STRINGPREP)
+else
+libcontrib_la_SOURCES = getopti.c $(STRINGPREP) $(REGEX)
+endif
+
+#ifdef SILC_DIST_TOOLKIT
+if HAVE_REGEX
+REGEXH =
else
else
-libcontrib_la_SOURCES = $(STRINGPREP) $(GETOPT) $(REGEX)
+REGEXH = regexpr.h
endif
endif
+include_HEADERS = \
+ $(REGEXH) \
+ getopti.h \
+ gunicomp.h \
+ gunidecomp.h \
+ stringprep.h
+#endif SILC_DIST_TOOLKIT
EXTRA_DIST = *.c *.h
EXTRA_DIST = *.c *.h