Changeset 2762


Ignore:
Timestamp:
Aug 15, 2007, 2:48:32 AM (14 years ago)
Author:
charles
Message:

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

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/cli/Makefile.am

    r2750 r2762  
    77
    88transmission_cli_LDADD = \
    9     ../libtransmission/libtransmission.a \
    10     $(LIBEVENT_LIBS) \
     9    $(top_builddir)/libtransmission/libtransmission.a \
     10    $(top_builddir)/third-party/libevent/libevent.la \
    1111    $(PTHREAD_LIBS) -lm
     12
  • trunk/configure.ac

    r2755 r2762  
    77AC_CONFIG_SRCDIR(libtransmission/transmission.h)
    88AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
    9 AM_MAINTAINER_MODE
     9AC_PROG_LIBTOOL
    1010
    1111GLIB_MINIMUM=2.6.0
     
    4949AC_CONFIG_SUBDIRS([third-party/libevent])
    5050AC_MSG_NOTICE([invoking libevent's configure script])
    51 LIBEVENT_LIBS="\$(top_srcdir)/third-party/libevent/.libs/libevent.a"
    5251LIBEVENT_CPPFLAGS="-I\$(top_srcdir)/third-party/libevent"
    53 AC_SUBST(LIBEVENT_LIBS)
    5452AC_SUBST(LIBEVENT_CPPFLAGS)
    5553
  • trunk/daemon/Makefile.am

    r2400 r2762  
    2020    transmission-proxy
    2121
    22 COMMON_LDADD = ./libdaemon.a ../libtransmission/libtransmission.a -levent $(PTHREAD_LIBS) -lm
     22COMMON_LDADD = \
     23    ./libdaemon.a \
     24    $(top_builddir)/libtransmission/libtransmission.a \
     25    $(top_builddir)/third-party/libevent/libevent.la \
     26    $(PTHREAD_LIBS) -lm
     27
    2328transmission_daemon_SOURCES = daemon.c server.c torrents.c
    2429transmission_daemon_LDADD = $(COMMON_LDADD)
  • trunk/gtk/Makefile.am

    r2750 r2762  
    5151
    5252transmission_gtk_LDADD = \
    53     ../libtransmission/libtransmission.a \
     53    $(top_builddir)/libtransmission/libtransmission.a \
     54    $(top_builddir)/third-party/libevent/libevent.la \
    5455    $(GTK_LIBS) \
    5556    $(GLIB_LIBS) \
    56     $(LIBEVENT_LIBS) \
    5757    $(PTHREAD_LIBS) -lm
  • trunk/libtransmission/Makefile.am

    r2757 r2762  
    1 AM_CPPFLAGS = -I. -I@top_srcdir@ -D__TRANSMISSION__
     1AM_CPPFLAGS = -I. -I$(top_srcdir) -D__TRANSMISSION__ $(LIBEVENT_CPPFLAGS)
     2
     3AM_CFLAGS = $(PTHREAD_CFLAGS)
    24
    35noinst_LIBRARIES = libtransmission.a
  • trunk/wx/Makefile.am

    r2750 r2762  
    1818
    1919Xmission_LDADD = \
    20   ../libtransmission/libtransmission.a \
    21   $(LIBEVENT_LIBS) \
     20  $(top_builddir)/libtransmission/libtransmission.a \
     21  $(top_builddir)/third-party/libevent/libevent.la \
    2222  $(WX_LIBS) \
    2323  $(PTHREAD_LIBS) -lm
Note: See TracChangeset for help on using the changeset viewer.