--- Makefile.orig	Tue Jul  9 12:26:41 2002
+++ Makefile	Sat Sep 28 22:19:21 2002
@@ -16,23 +16,23 @@
 #CC = gcc
 
 # Basic compiler, linker flags; should not need any changes.
-CFLAGS += -g -Wall
-LDFLAGS += -g
+#CFLAGS += -g -Wall
+#LDFLAGS += -g
 
 # You might need these if libpcap is installed somewhere random.
-CFLAGS += -I/usr/include/pcap
+#CFLAGS += -I/usr/include/pcap
 #LDFLAGS += -L/path/to/libpcap.so
 
 # Required on Linux to get BSDish definitions of the TCP/IP structs.
-CFLAGS += -D_BSD_SOURCE
+#CFLAGS += -D_BSD_SOURCE
 
 # We always need the pcap and pthread libraries.
-LDLIBS += -lpcap -lpthread
+LDLIBS += -lpcap ${PTHREAD_LIBS}
 
 # Optional C compiler and linker flags. Typical driftnet builds have support
 # for displaying captured images in an X window, and need the following flags:
-CFLAGS  += `gtk-config --cflags`
-LDLIBS  += -ljpeg -lungif `gtk-config --libs`
+CFLAGS  += ${PTHREAD_CFLAGS} `${GTK_CONFIG} --cflags`
+LDLIBS  += -ljpeg -lungif `${GTK_CONFIG} --libs`
 
 # Alternatively, you can build a version of driftnet which can only be used
 # in `adjunct' mode as the back end for some other image-processing program. To
@@ -43,7 +43,7 @@
 # On systems with a C99 compiler, driftnet will use <stdint.h> for the
 # definitions of types such as uint8_t. On other systems like Solaris, these
 # are in <sys/types.h>, and you should uncomment this line.
-#CFLAGS += -DUSE_SYS_TYPES_H
+CFLAGS += -DUSE_SYS_TYPES_H
 
 # On Solaris, it is necessary to link against -lposix4 for the definition of
 # nanosleep; uncomment the below.
@@ -51,7 +51,7 @@
 
 # added 20020604 edobbs
 # On BSD systems, may need to use /usr/local/include
-#CFLAGS += -I/usr/local/include
+CFLAGS += -I/usr/local/include
 
 
 #