diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-10-08 23:45:26 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-10-08 23:45:26 +0000 |
| commit | f54c08ed35d3b124a69c853991d3251802a0f9a3 (patch) | |
| tree | 86b0c244fa48f9e7b75a53f3e24a4b70f3656c86 /Makefile.nmake | |
| parent | 74501b2874a4e4fe55905d592e9553e8dee3f4c1 (diff) | |
Add some QT_DIR checks.
svn path=/trunk/; revision=52459
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 17528cee30..1249e14328 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -557,8 +557,10 @@ clean: clean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd gtk $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean +!IFDEF QT_DIR cd ../qt $(MAKE) clean +!ENDIF cd ../win32 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../cli @@ -609,8 +611,10 @@ distclean: distclean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd gtk $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean +!IFDEF QT_DIR cd ../qt $(MAKE) distclean +!ENDIF cd ../win32 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../cli @@ -654,8 +658,10 @@ maintainer-clean: maintainer-clean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd gtk $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean +!IFDEF QT_DIR cd ../qt $(MAKE) distclean +!ENDIF cd ../win32 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../cli @@ -772,10 +778,12 @@ gtk:: help config.h svnversion.h doxygen cd ../.. qt:: help config.h svnversion.h doxygen +!IFDEF QT_DIR cd ui/qt $(QT_DIR)\bin\qmake CONFIG+=release QtShark.pro nmake cd ../.. +!ENDIF win32:: cd ui/win32 |