mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-03 10:15:45 +00:00
Code Issues Releases Wiki Activity

more work on getting our autoconf setup to play nice with libevent

Browse source
This commit is contained in:
Charles Kerr 2007-08-15 02:48:32 +00:00
parent f407e44edc
commit db7a354958
6 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cli/Makefile.am
View file

@ -6,6 +6,7 @@ bin_PROGRAMS = transmission-cli
transmission_cli_SOURCES = transmissioncli.c
transmission_cli_LDADD = \
../libtransmission/libtransmission.a \
$(LIBEVENT_LIBS) \
$(top_builddir)/libtransmission/libtransmission.a \
$(top_builddir)/third-party/libevent/libevent.la \
$(PTHREAD_LIBS) -lm

4
configure.ac
View file

@ -6,7 +6,7 @@ AC_PREREQ(2.54)
dnl AM_CONFIG_HEADER(config.h)
AC_CONFIG_SRCDIR(libtransmission/transmission.h)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
AM_MAINTAINER_MODE
AC_PROG_LIBTOOL
GLIB_MINIMUM=2.6.0
GTK_MINIMUM=2.6.0
@ -48,9 +48,7 @@ dnl libevent fun
AC_CONFIG_SUBDIRS([third-party/libevent])
AC_MSG_NOTICE([invoking libevent's configure script])
LIBEVENT_LIBS="\$(top_srcdir)/third-party/libevent/.libs/libevent.a"
LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent"
AC_SUBST(LIBEVENT_LIBS)
AC_SUBST(LIBEVENT_CPPFLAGS)

7
daemon/Makefile.am
View file

@ -19,7 +19,12 @@ bin_PROGRAMS = \
transmission-remote \
transmission-proxy
COMMON_LDADD = ./libdaemon.a ../libtransmission/libtransmission.a -levent $(PTHREAD_LIBS) -lm
COMMON_LDADD = \
./libdaemon.a \
$(top_builddir)/libtransmission/libtransmission.a \
$(top_builddir)/third-party/libevent/libevent.la \
$(PTHREAD_LIBS) -lm
transmission_daemon_SOURCES = daemon.c server.c torrents.c
transmission_daemon_LDADD = $(COMMON_LDADD)
transmission_remote_SOURCES = client.c remote.c

4
gtk/Makefile.am
View file

@ -50,8 +50,8 @@ transmission_gtk_SOURCES = \
util.c
transmission_gtk_LDADD = \
../libtransmission/libtransmission.a \
$(top_builddir)/libtransmission/libtransmission.a \
$(top_builddir)/third-party/libevent/libevent.la \
$(GTK_LIBS) \
$(GLIB_LIBS) \
$(LIBEVENT_LIBS) \
$(PTHREAD_LIBS) -lm

4
libtransmission/Makefile.am
View file

@ -1,4 +1,6 @@
AM_CPPFLAGS = -I. -I@top_srcdir@ -D__TRANSMISSION__
AM_CPPFLAGS = -I. -I$(top_srcdir) -D__TRANSMISSION__ $(LIBEVENT_CPPFLAGS)
AM_CFLAGS = $(PTHREAD_CFLAGS)
noinst_LIBRARIES = libtransmission.a

4
wx/Makefile.am
View file

@ -17,7 +17,7 @@ Xmission_SOURCES = \
xmission.cc
Xmission_LDADD = \
../libtransmission/libtransmission.a \
$(LIBEVENT_LIBS) \
$(top_builddir)/libtransmission/libtransmission.a \
$(top_builddir)/third-party/libevent/libevent.la \
$(WX_LIBS) \
$(PTHREAD_LIBS) -lm