moved back windows compat headers and fixed catta headers to stop clutter dependent...

[catta] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 317a8ab4c97f28b787a6111038b3832395300b16..9471992c950abbc642d243357c38a947c3ba95a8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,10 +75,20 @@ if HAVE_PF_ROUTE
 libcatta_la_SOURCES += \
        iface-pfroute.c iface-pfroute.h
 else
+if WINDOWS
+libcatta_la_SOURCES += \
+       iface-windows.c iface-windows.h
+else
 libcatta_la_SOURCES += \
        iface-none.c
 endif
 endif
+endif
+
+if WINDOWS
+# require Windows Vista or above (for winsock2)
+AM_CFLAGS+=-DWINVER=0x0600 -D_WIN32_WINNT=0x0600
+endif
 
 libcatta_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
 libcatta_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
@@ -88,7 +98,6 @@ if WINDOWS
 libcatta_la_SOURCES += \
        compat/windows/wincompat.c \
        compat/windows/wincompat.h
-libcatta_la_LIBADD += -lws2_32
-libcatta_la_LDFLAGS += -no-undefined
+libcatta_la_LIBADD += -lws2_32 -liphlpapi
+libcatta_la_LDFLAGS += -no-undefined -Wl,--kill-at,--output-def=.libs/libcatta-0.def
 endif
-