osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Add some QT_DIR checks. 

svn path=/trunk/; revision=52459
This commit is contained in:
Gerald Combs 2013-10-08 23:45:26 +00:00
parent 74501b2874
commit f54c08ed35
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.nmake
View File

@ -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