diff options
author | Gerald Combs <gerald@wireshark.org> | 2005-09-16 16:25:53 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2005-09-16 16:25:53 +0000 |
commit | 33cfe1725a4d649f764a8e2a4970c41247d65daf (patch) | |
tree | 977f370a6e0accf879aa0b840fa7dc0ee9d9c339 /Makefile.nmake | |
parent | 092c0c20ed25b21f5b07d00e3fafed6c5ae6ad58 (diff) |
Sort each conversation column numerically. Fix up whitespace.
It looks like we can't put "COPYCMD=/Y" in config.nmake and expect nmake
to do the right thing. Add a comment, and set COPYCMD explicitly in the
root Makefile.nmake. The rest of the occurrences of xcopy will have to
be taken care of at some point.
svn path=/trunk/; revision=15840
Diffstat (limited to 'Makefile.nmake')
-rw-r--r-- | Makefile.nmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 65709d1477..2cdc24cb58 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -360,6 +360,7 @@ gtk:: help config.h svnversion.h AUTHORS-SHORT doxygen gtk2:: help config.h svnversion.h AUTHORS-SHORT if not exist gtk2.tmp mkdir gtk2.tmp cd gtk + set copycmd=/y xcopy Makefile.* ..\gtk2.tmp /d xcopy *.c ..\gtk2.tmp /d xcopy *.h ..\gtk2.tmp /d @@ -532,6 +533,7 @@ install-deps: clean-deps install-gtk1-deps install-gtk2-deps install-gtk2-deps: install-required-deps !IFDEF GTK2_DIR + set copycmd=/y xcopy $(GTK2_DIR)\bin\libgdk-win32-2.0-0.dll . /d xcopy $(GTK2_DIR)\bin\libgdk_pixbuf-2.0-0.dll . /d xcopy $(GTK2_DIR)\bin\libgtk-win32-2.0-0.dll . /d @@ -558,11 +560,13 @@ install-gtk2-deps: install-required-deps install-gtk1-deps: install-required-deps !IFDEF GTK1_DIR + set copycmd=/y xcopy $(GTK1_DIR)\lib\libgtk-0.dll . /d xcopy $(GTK1_DIR)\lib\libgdk-0.dll . /d !ENDIF install-required-deps: + set copycmd=/y xcopy wiretap\wiretap-$(WTAP_VERSION).dll . /d !IFDEF ENABLE_LIBETHEREAL xcopy epan\libethereal.dll . /d |