Revert part of r48021: those hunks are no more needed with r48170
svn path=/trunk/; revision=48171
This commit is contained in:
parent
29ceca1b26
commit
c2862992b9
|
@ -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) @<<
|
||||
|
|
Loading…
Reference in New Issue