fixed wrong dependencies again in lib/si/Makefile.am
This commit is contained in:
parent
31fc83fbeb
commit
36d9b5f49a
@ -46,6 +46,7 @@ libqsesi_la_SOURCES = \
|
|||||||
libqsesi_la_CFLAGS = $(PTHREAD_CFLAGS)
|
libqsesi_la_CFLAGS = $(PTHREAD_CFLAGS)
|
||||||
libqsesi_la_LDFLAGS = -L../cmn -version-info 1:0:0 -no-undefined
|
libqsesi_la_LDFLAGS = -L../cmn -version-info 1:0:0 -no-undefined
|
||||||
libqsesi_la_LIBADD = -lqsecmn $(PTHREAD_LIBS) $(SSL_LIBS)
|
libqsesi_la_LIBADD = -lqsecmn $(PTHREAD_LIBS) $(SSL_LIBS)
|
||||||
|
libqsesi_la_DEPENDENCIES = ../../lib/cmn/libqsecmn.la
|
||||||
|
|
||||||
if ENABLE_CXX
|
if ENABLE_CXX
|
||||||
lib_LTLIBRARIES += libqsesixx.la
|
lib_LTLIBRARIES += libqsesixx.la
|
||||||
@ -58,5 +59,6 @@ libqsesixx_la_SOURCES = \
|
|||||||
Thread.cpp
|
Thread.cpp
|
||||||
libqsesixx_la_LDFLAGS = -L. -L../cmn -version-info 1:0:0 -no-undefined
|
libqsesixx_la_LDFLAGS = -L. -L../cmn -version-info 1:0:0 -no-undefined
|
||||||
libqsesixx_la_LIBADD = -lqsecmnxx -lqsesi -lqsecmn
|
libqsesixx_la_LIBADD = -lqsecmnxx -lqsesi -lqsecmn
|
||||||
|
libqsesixx_la_DEPENDENCIES = ../../lib/cmn/libqsecmnxx.la libqsesi.la ../../lib/cmn/libqsecmn.la
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -90,6 +90,7 @@ POST_UNINSTALL = :
|
|||||||
build_triplet = @build@
|
build_triplet = @build@
|
||||||
host_triplet = @host@
|
host_triplet = @host@
|
||||||
@ENABLE_CXX_TRUE@am__append_1 = libqsesixx.la
|
@ENABLE_CXX_TRUE@am__append_1 = libqsesixx.la
|
||||||
|
@ENABLE_CXX_FALSE@libqsesixx_la_DEPENDENCIES =
|
||||||
subdir = lib/si
|
subdir = lib/si
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||||
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \
|
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_sign.m4 \
|
||||||
@ -137,7 +138,6 @@ am__uninstall_files_from_dir = { \
|
|||||||
am__installdirs = "$(DESTDIR)$(libdir)"
|
am__installdirs = "$(DESTDIR)$(libdir)"
|
||||||
LTLIBRARIES = $(lib_LTLIBRARIES)
|
LTLIBRARIES = $(lib_LTLIBRARIES)
|
||||||
am__DEPENDENCIES_1 =
|
am__DEPENDENCIES_1 =
|
||||||
libqsesi_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
|
|
||||||
am_libqsesi_la_OBJECTS = libqsesi_la-cnd.lo libqsesi_la-dir.lo \
|
am_libqsesi_la_OBJECTS = libqsesi_la-cnd.lo libqsesi_la-dir.lo \
|
||||||
libqsesi_la-fio.lo libqsesi_la-fs.lo libqsesi_la-fs-attr.lo \
|
libqsesi_la-fio.lo libqsesi_la-fs.lo libqsesi_la-fs-attr.lo \
|
||||||
libqsesi_la-fs-copy.lo libqsesi_la-fs-delete.lo \
|
libqsesi_la-fs-copy.lo libqsesi_la-fs-delete.lo \
|
||||||
@ -159,7 +159,6 @@ am__v_lt_1 =
|
|||||||
libqsesi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
libqsesi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||||
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libqsesi_la_CFLAGS) \
|
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libqsesi_la_CFLAGS) \
|
||||||
$(CFLAGS) $(libqsesi_la_LDFLAGS) $(LDFLAGS) -o $@
|
$(CFLAGS) $(libqsesi_la_LDFLAGS) $(LDFLAGS) -o $@
|
||||||
libqsesixx_la_DEPENDENCIES =
|
|
||||||
am__libqsesixx_la_SOURCES_DIST = App.cpp Path.cpp SocketAddress.cpp \
|
am__libqsesixx_la_SOURCES_DIST = App.cpp Path.cpp SocketAddress.cpp \
|
||||||
Socket.cpp TcpServer.cpp Thread.cpp
|
Socket.cpp TcpServer.cpp Thread.cpp
|
||||||
@ENABLE_CXX_TRUE@am_libqsesixx_la_OBJECTS = App.lo Path.lo \
|
@ENABLE_CXX_TRUE@am_libqsesixx_la_OBJECTS = App.lo Path.lo \
|
||||||
@ -466,6 +465,7 @@ libqsesi_la_SOURCES = \
|
|||||||
libqsesi_la_CFLAGS = $(PTHREAD_CFLAGS)
|
libqsesi_la_CFLAGS = $(PTHREAD_CFLAGS)
|
||||||
libqsesi_la_LDFLAGS = -L../cmn -version-info 1:0:0 -no-undefined
|
libqsesi_la_LDFLAGS = -L../cmn -version-info 1:0:0 -no-undefined
|
||||||
libqsesi_la_LIBADD = -lqsecmn $(PTHREAD_LIBS) $(SSL_LIBS)
|
libqsesi_la_LIBADD = -lqsecmn $(PTHREAD_LIBS) $(SSL_LIBS)
|
||||||
|
libqsesi_la_DEPENDENCIES = ../../lib/cmn/libqsecmn.la
|
||||||
@ENABLE_CXX_TRUE@libqsesixx_la_SOURCES = \
|
@ENABLE_CXX_TRUE@libqsesixx_la_SOURCES = \
|
||||||
@ENABLE_CXX_TRUE@ App.cpp \
|
@ENABLE_CXX_TRUE@ App.cpp \
|
||||||
@ENABLE_CXX_TRUE@ Path.cpp \
|
@ENABLE_CXX_TRUE@ Path.cpp \
|
||||||
@ -476,6 +476,7 @@ libqsesi_la_LIBADD = -lqsecmn $(PTHREAD_LIBS) $(SSL_LIBS)
|
|||||||
|
|
||||||
@ENABLE_CXX_TRUE@libqsesixx_la_LDFLAGS = -L. -L../cmn -version-info 1:0:0 -no-undefined
|
@ENABLE_CXX_TRUE@libqsesixx_la_LDFLAGS = -L. -L../cmn -version-info 1:0:0 -no-undefined
|
||||||
@ENABLE_CXX_TRUE@libqsesixx_la_LIBADD = -lqsecmnxx -lqsesi -lqsecmn
|
@ENABLE_CXX_TRUE@libqsesixx_la_LIBADD = -lqsecmnxx -lqsesi -lqsecmn
|
||||||
|
@ENABLE_CXX_TRUE@libqsesixx_la_DEPENDENCIES = ../../lib/cmn/libqsecmnxx.la libqsesi.la ../../lib/cmn/libqsecmn.la
|
||||||
all: all-am
|
all: all-am
|
||||||
|
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
Loading…
Reference in New Issue
Block a user