Configure and makefile fix
This commit is contained in:
parent
e6dd64a9ea
commit
a738cadd8d
@ -4,7 +4,8 @@ AC_INIT(libsntl, 0.1)
|
||||
|
||||
#LDFLAGS="$LDFLAGS -L/mingw/lib -L/local/lib"
|
||||
|
||||
AC_CONFIG_MACRO_DIR(['/share/aclocal/'])
|
||||
AC_CONFIG_MACRO_DIR(['aclocal'])
|
||||
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
AM_INIT_AUTOMAKE([1.11])
|
||||
|
@ -16,9 +16,12 @@ endif !BUILD_WIN32
|
||||
|
||||
libsntl = ../lib/.libs/libsntl.la
|
||||
|
||||
bin_PROGRAMS = sntlc
|
||||
|
||||
|
||||
if !BUILD_WIN32
|
||||
|
||||
bin_PROGRAMS = sntlc sntld gentest
|
||||
|
||||
sntld_SOURCES = sntld.c
|
||||
sntld_LDADD = $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENSSL_LIBS) \
|
||||
$(LIBUUID_LIBS) $(libsntl)
|
||||
@ -33,6 +36,8 @@ gentest_LDADD = $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENSSL_LIBS) \
|
||||
|
||||
else BUILD_WIN32
|
||||
|
||||
bin_PROGRAMS = sntlc
|
||||
|
||||
sntlc_SOURCES = sntlc.c
|
||||
sntlc_LDADD = $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENSSL_LIBS) \
|
||||
$(LIBUUID_LIBS) $(libsntl) -lws2_32
|
||||
|
@ -22,7 +22,9 @@ libsntl_la_LIBADD = -lpthread -lcrypto $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENS
|
||||
|
||||
if BUILD_WIN32
|
||||
libsntl_la_LIBADD += -luuid
|
||||
endif BUILD_WIN32
|
||||
else
|
||||
libsntl_la_LIBADD += $(LIBUUID_LIBS)
|
||||
endif !BUILD_WIN32
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = libsntl.pc
|
||||
|
Loading…
x
Reference in New Issue
Block a user