--- Makefile.in.orig	Sun Oct 23 12:29:54 2011
+++ Makefile.in	Wed Apr 25 11:16:44 2012
@@ -82,7 +82,7 @@ LIB	= \
 	-lm @LIBS@
 #	-L@libdir@ \
 
-CFLAGS	+= $(CCOPT) $(DEFINE) 
+CFLAGS	+= $(CCOPT) @CFLAGS@ $(DEFINE) 
 
 # Explicitly define compilation rules since SunOS 4's make doesn't like gcc.
 # Also, gcc does not remove the .o before forking 'as', which can be a
@@ -405,33 +405,9 @@ all-recursive:
 
 
 
-ifeq ($(NSLIB),libns.dll)
-
-# This is for cygwin
-
-NS_CPPFLAGS = -DNSLIBNAME=\"$(NSLIB)\" 
-NS_LIBS =  @DL_LIBS@
-
-$(NSLIB): $(OBJ) common/tclAppInit.o 
-	$(LINK) -shared $(LDFLAGS) \
-		$(LDOUT)$@  \
-		-Wl,--export-all-symbols \
-		-Wl,--enable-auto-import \
-		-Wl,--out-implib=$@.a \
-		-Wl,--whole-archive $^ \
-		-Wl,--no-whole-archive @V_IMPORT_LIBS@ 
-
-$(NS): $(NSLIB) common/main-modular.cc 
-	$(LINK) $(NS_CPPFLAGS) $(LDFLAGS) $(LDOUT)$@ common/main-modular.cc $(NS_LIBS)
-
-else 
-
-# default for all systems but cygwin
-
 $(NS): $(OBJ) common/tclAppInit.o common/main-monolithic.o
-	$(LINK) $(LDFLAGS) $(LDOUT)$@ $^ $(LIB)
+	$(LINK) $(LDFLAGS) $(LDOUT)$@ $> $(LIB)
 
-endif 
 
 
 
@@ -441,10 +417,10 @@ Makefile: Makefile.in
 	false
 
 $(NSE): $(OBJ) common/tclAppInit.o common/main-monolithic.o $(OBJ_EMULATE_CC) $(OBJ_EMULATE_C)
-	$(LINK) $(LDFLAGS) $(LDOUT)$@ $^ $(LIB) 
+	$(LINK) $(LDFLAGS) $(LDOUT)$@ $> $(LIB) 
 
 $(NSTK): $(OBJ) common/tkAppInit.o 
-	$(LINK) $(LDFLAGS) $(LDOUT)$@ $^ $(LIB)
+	$(LINK) $(LDFLAGS) $(LDOUT)$@ $> $(LIB)
 
 ns.dyn: $(OBJ) common/tclAppInit.o common/main-monolithic.o 
 	$(LINK) $(LDFLAGS) -o $@ $^ $(LIB)