diff options
| author | Yang Tse <yangsita@gmail.com> | 2012-04-17 05:46:30 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2012-04-17 13:29:58 +0200 |
| commit | 41191cdd54ff7f6bbb5e65bb0cd56fe0a50b5d14 (patch) | |
| tree | 82701e20931787515e89cf74304e4b63478febe9 /Makefile.am | |
| parent | 7e2f70a08c5ae5b43b8398f16d103914eaf30ea2 (diff) | |
| download | c-ares-41191cdd54ff7f6bbb5e65bb0cd56fe0a50b5d14.tar.gz c-ares-41191cdd54ff7f6bbb5e65bb0cd56fe0a50b5d14.tar.bz2 c-ares-41191cdd54ff7f6bbb5e65bb0cd56fe0a50b5d14.zip | |
configure: Windows cross-compilation fixes
CARES_BUILDING_LIBRARY and CARES_STATICLIB no longer defined in ares_config.h,
configure will generate appropriate conditionals so that mentioned symbols
get defined and used in Makefile derived from Makefile.am at compilation time.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 8969403..08d6a58 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,6 +103,20 @@ libcares_la_LDFLAGS = $(UNDEF) $(VER) # Add -Werror if defined CFLAGS += @CARES_CFLAG_EXTRAS@ +# For Windows build targets, when building or using static c-ares +if USE_CPPFLAG_CARES_STATICLIB +AM_CPPFLAGS = -DCARES_STATICLIB +else +AM_CPPFLAGS = +endif + +# For Windows build targets, when building c-ares library +if USE_CPPFLAG_CARES_BUILDING_LIBRARY +libcares_la_CPPFLAGS = $(AM_CPPFLAGS) -DCARES_BUILDING_LIBRARY +else +libcares_la_CPPFLAGS = $(AM_CPPFLAGS) +endif + # Makefile.inc provides the CSOURCES and HHEADERS defines include Makefile.inc @@ -117,14 +131,17 @@ libcares_la_HEADERS = ares.h ares_version.h ares_dns.h \ ahost_SOURCES = ahost.c $(SAMPLESOURCES) $(SAMPLEHEADERS) ahost_LDADD = $(top_builddir)/libcares.la ahost_CFLAGS = $(AM_CFLAGS) +ahost_CPPFLAGS = $(AM_CPPFLAGS) adig_SOURCES = adig.c $(SAMPLESOURCES) $(SAMPLEHEADERS) adig_LDADD = $(top_builddir)/libcares.la adig_CFLAGS = $(AM_CFLAGS) +adig_CPPFLAGS = $(AM_CPPFLAGS) acountry_SOURCES = acountry.c $(SAMPLESOURCES) $(SAMPLEHEADERS) acountry_LDADD = $(top_builddir)/libcares.la acountry_CFLAGS = $(AM_CFLAGS) +acountry_CPPFLAGS = $(AM_CPPFLAGS) SOURCEDMANDIR = man3 SOURCEDMANPAGES = ares_init.3 |