diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-08-28 15:58:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-28 15:58:18 -0400 |
| commit | 7092f3b6774d02bc8dbb1136660c23685cadef6c (patch) | |
| tree | f771c174e3027206cb4c80736d68f475e3cdd2cd /Makefile.am | |
| parent | 7b18e5c633f2a3ad9b70fdb7d463f264f29b067f (diff) | |
| download | libevent-7092f3b6774d02bc8dbb1136660c23685cadef6c.tar.gz | |
Switch to non-recursive makefiles
This approach should let Make work better, let libevent build faster
(especially when using a parallelized build), and basically make the
Makefiles easier to maintain.
See http://miller.emu.id.au/pmiller/books/rmch/ for more info on why
you'd want to do this.
This is due to an idea from Zack Weinberg; the patch is my own.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 2167cc82..ac3a8f4d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -125,7 +125,15 @@ else noinst_LTLIBRARIES = $(LIBEVENT_LIBS_LA) endif -SUBDIRS = . include sample test +EXTRA_SOURCE= +noinst_HEADERS= +noinst_PROGRAMS= +EXTRA_PROGRAMS= +CLEANFILES= +BUILT_SOURCES = +include include/Makefile.am +include sample/Makefile.am +include test/Makefile.am if BUILD_WIN32 @@ -164,7 +172,7 @@ if SIGNAL_SUPPORT SYS_SRC += signal.c endif -BUILT_SOURCES = include/event2/event-config.h +BUILT_SOURCES += include/event2/event-config.h include/event2/event-config.h: config.h make-event-config.sed test -d include/event2 || $(MKDIR_P) include/event2 @@ -189,7 +197,7 @@ CORE_SRC = \ strlcpy.c \ $(SYS_SRC) -EXTRA_SRC = \ +EXTRAS_SRC = \ evdns.c \ event_tagging.c \ evrpc.c \ @@ -205,7 +213,7 @@ endif GENERIC_LDFLAGS = -version-info $(VERSION_INFO) $(RELEASE) $(NO_UNDEFINED) -libevent_la_SOURCES = $(CORE_SRC) $(EXTRA_SRC) +libevent_la_SOURCES = $(CORE_SRC) $(EXTRAS_SRC) libevent_la_LIBADD = @LTLIBOBJS@ $(SYS_LIBS) libevent_la_LDFLAGS = $(GENERIC_LDFLAGS) @@ -219,7 +227,7 @@ libevent_pthreads_la_LIBADD = $(MAYBE_CORE) libevent_pthreads_la_LDFLAGS = $(GENERIC_LDFLAGS) endif -libevent_extra_la_SOURCES = $(EXTRA_SRC) +libevent_extra_la_SOURCES = $(EXTRAS_SRC) libevent_extra_la_LIBADD = $(MAYBE_CORE) $(SYS_LIBS) libevent_extra_la_LDFLAGS = $(GENERIC_LDFLAGS) @@ -230,7 +238,7 @@ libevent_openssl_la_LDFLAGS = $(GENERIC_LDFLAGS) libevent_openssl_la_CPPFLAGS = $(AM_CPPFLAGS) $(OPENSSL_INCS) endif -noinst_HEADERS = \ +noinst_HEADERS += \ WIN32-Code/evconfig-private.h \ WIN32-Code/event2/event-config.h \ WIN32-Code/tree.h \ |