start of windows interface detection

[catta] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b37886270b68347eea37f30f3ebdd1b01678679e..3b3a058cbaa5638dc5b7accfdcb5e4b2896e97e1 100644 (file)
--- 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")'
 
@@ -79,17 +75,25 @@ 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
+
+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
 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)