summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am28
1 files changed, 11 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am
index a1ee905..08486d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -114,29 +114,23 @@ libcares_la_LDFLAGS = $(AM_LDFLAGS) $(libcares_la_LDFLAGS_EXTRA)
# Add -Werror if defined
CFLAGS += @CARES_CFLAG_EXTRAS@
-CFLAG_CARES_SYMBOL_HIDING = @CFLAG_CARES_SYMBOL_HIDING@
-
-# For Windows build targets, when building or using static c-ares
if USE_CPPFLAG_CARES_STATICLIB
-AM_CPPFLAGS += -DCARES_STATICLIB
+AM_CPPFLAGS += $(CPPFLAG_CARES_STATICLIB)
endif
+libcares_la_CFLAGS_EXTRA =
+
+libcares_la_CPPFLAGS_EXTRA = -DCARES_BUILDING_LIBRARY
+
if DOING_CARES_SYMBOL_HIDING
-if USE_CPPFLAG_CARES_BUILDING_LIBRARY
-libcares_la_CPPFLAGS = $(AM_CPPFLAGS) -DCARES_SYMBOL_HIDING -DCARES_BUILDING_LIBRARY
-else
-libcares_la_CPPFLAGS = $(AM_CPPFLAGS) -DCARES_SYMBOL_HIDING
-endif
-libcares_la_CFLAGS = $(AM_CFLAGS) $(CFLAG_CARES_SYMBOL_HIDING)
-else
-if USE_CPPFLAG_CARES_BUILDING_LIBRARY
-libcares_la_CPPFLAGS = $(AM_CPPFLAGS) -DCARES_BUILDING_LIBRARY
-else
-libcares_la_CPPFLAGS = $(AM_CPPFLAGS)
-endif
-libcares_la_CFLAGS = $(AM_CFLAGS)
+libcares_la_CFLAGS_EXTRA += $(CFLAG_CARES_SYMBOL_HIDING)
+libcares_la_CPPFLAGS_EXTRA += -DCARES_SYMBOL_HIDING
endif
+libcares_la_CFLAGS = $(AM_CFLAGS) $(libcares_la_CFLAGS_EXTRA)
+
+libcares_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcares_la_CPPFLAGS_EXTRA)
+
# Makefile.inc provides the CSOURCES and HHEADERS defines
include Makefile.inc