Use TK_LIBS instead of TK_GTK_LIBS and clean up the makefile a bit

git-svn-id: svn://10.0.0.236/trunk@18809 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/network/module/tests/Makefile.in

@@ -22,13 +22,13 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+PROGRAM = nettest
+
 CPPSRCS = \
 	nettest.cpp \
 	$(NULL)
 
-include $(topsrcdir)/config/config.mk
-
-INCLUDES += -I$(srcdir)/../src -I$(DIST)/include
+LOCAL_INCLUDES := -I$(srcdir)/../src
 
 REQUIRES = raptor netlib xpcom pref
 
@@ -45,7 +45,7 @@ LIBS = \
 	-lnetwork \
 	-lnetlib \
 	-lnetutil \
-    -lreg	\
+	-lreg	\
 	-lxpcom	\
 	-lpwcac \
 	-lmozdbm	\
@@ -57,14 +57,10 @@ LIBS = \
 	-lsecfree \
 	-lz \
 	$(NSPR_LIBS) \
+	$(TK_LIBS) \
 	$(NULL)
 
-ifdef TK_GTK_LIBS
-	LIBS += $(TK_GTK_LIBS)
-endif
-
-
-PROGRAM = nettest
+include $(topsrcdir)/config/config.mk
 
 include $(topsrcdir)/config/rules.mk