diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-03-07 17:39:20 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-03-07 17:39:20 +0000 |
| commit | c2862992b99bc87536f408012ce867a0d5651238 (patch) | |
| tree | 72be94beeef73e998b4f3c4ead4a2e61af4e5e82 /Makefile.nmake | |
| parent | 29ceca1b26e3507105f8038eb5cd5ca6bb4871cc (diff) | |
| download | wireshark-c2862992b99bc87536f408012ce867a0d5651238.tar.gz wireshark-c2862992b99bc87536f408012ce867a0d5651238.tar.bz2 wireshark-c2862992b99bc87536f408012ce867a0d5651238.zip | |
Revert part of r48021: those hunks are no more needed with r48170
svn path=/trunk/; revision=48171
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index a6831a9374..1279b5c970 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -326,8 +326,6 @@ rawshark.exe : $(LIBS_CHECK) config.h $(rawshark_OBJECTS) epan ui image\rawshark # XXX: This makefile does not properly handle doing a 'nmake ... capinfos.exe' directly since some of the .objs # (e.g. epan\plugins.obj) must be built first using epan\Makefile.nmake (which happens for 'nmake ... all'). # Linking with setargv.obj enables "wildcard expansion" of command-line arguments -capinfos.obj : - $(CC) $(CFLAGS) -Fd.\ -c capinfos.c capinfos.exe : $(LIBS_CHECK) config.h $(capinfos_OBJECTS) wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res @echo Linking $@ $(LINK) @<< @@ -339,8 +337,6 @@ capinfos.exe : $(LIBS_CHECK) config.h $(capinfos_OBJECTS) wsutil\libwsutil.lib w # XXX: This makefile does not properly handle doing a 'nmake ... editcap.exe' directly since some of the .objs # (e.g. epan\plugins.obj) must be built first using epan\Makefile.nmake (which happens for 'nmake ... all'). -editcap.obj : - $(CC) $(CFLAGS) -Fd.\ -c editcap.c editcap.exe : $(LIBS_CHECK) config.h $(editcap_OBJECTS) wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res @echo Linking $@ $(LINK) @<< |