From f414b3cae366d3f72837d9d31a4e5d72e11dc0e0 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 25 Jul 2012 21:08:44 +0000
Subject: [PATCH] Revert parts of r43978 and r43976 so that we can catch
 updates in subdirectories.

svn path=/trunk/; revision=44014
---
 Makefile.nmake | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/Makefile.nmake b/Makefile.nmake
index 5ba8d811bc..59a01429ba 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -717,34 +717,26 @@ codecs::
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..
 
-ui\libui.lib:
+ui:: help config.h svnversion.h doxygen
 	cd ui
 	$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libui.lib
 	cd ..
 
-ui:: help config.h svnversion.h doxygen ui\libui.lib
-
-ui\gtk\libgtkui.lib:
+gtk:: help config.h svnversion.h doxygen
 	cd ui/gtk
 	$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui.lib
 	cd ../..
 
-gtk:: help config.h svnversion.h doxygen ui\gtk\libgtkui.lib
-
-ui\win32\libgtkui_win32.lib:
+win32::
 	cd ui/win32
 	$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui_win32.lib
 	cd ../..
 
-win32:: ui\win32\libgtkui_win32.lib
-
-ui\cli\libcliui.lib:
+cli:: help config.h svnversion.h doxygen
 	cd ui/cli
 	$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libcliui.lib
 	cd ../..
 
-cli:: help config.h svnversion.h doxygen ui\cli\libcliui.lib
-
 epan:: $(RESOURCES) $(ZLIB_DLL) wiretap\wiretap-$(WTAP_VERSION).lib $(BUILT_SOURCES) doxygen
 	cd epan
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake