X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2FMakefile.am;h=b5cb26b62969fe9ffe71501bc737acd283f0a6a5;hb=refs%2Fheads%2Fdevelop;hp=b37886270b68347eea37f30f3ebdd1b01678679e;hpb=45fd76be0ef793b130720bb64b0356aa4e4566ec;p=catta

diff --git a/src/Makefile.am b/src/Makefile.am
index b378862..b5cb26b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,10 +17,6 @@
 
 AM_CFLAGS=-I$(top_srcdir)/include
 
-if WINDOWS
-AM_CFLAGS += -Icompat/windows/include
-endif
-
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
@@ -57,7 +53,7 @@ libcatta_la_SOURCES = \
 	browse-service.c \
 	resolve-service.c \
 	dns.c dns.h \
-	rr.c rr.h rr-util.h \
+	rr.c rr-util.h \
 	log.c \
 	browse-dns-server.c \
 	fdutil.h fdutil.c \
@@ -79,17 +75,29 @@ 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)
+libcatta_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBCATTA_VERSION_INFO)
 
 if WINDOWS
 libcatta_la_SOURCES += \
 	compat/windows/wincompat.c \
 	compat/windows/wincompat.h
+libcatta_la_LIBADD += -lws2_32 -liphlpapi
+libcatta_la_LDFLAGS += -no-undefined -Wl,--kill-at,--output-def=.libs/libcatta-0.def
 endif
-
-libcatta_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-libcatta_la_LIBADD = $(AM_LDADD) $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(INTLLIBS)
-libcatta_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBCATTA_VERSION_INFO)