diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-06-16 15:05:26 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2000-06-16 15:05:26 +0000 |
| commit | 5afb4f7225bc895ad3f8cc5eba8aca376fe0d089 (patch) | |
| tree | 04e84cdf9e06596200d07ff7233c5f146ab77a38 /Makefile.nmake | |
| parent | f3eddb46cc49c24c0dce171b71d14a1694ba0907 (diff) | |
| download | wireshark-5afb4f7225bc895ad3f8cc5eba8aca376fe0d089.tar.gz wireshark-5afb4f7225bc895ad3f8cc5eba8aca376fe0d089.tar.bz2 wireshark-5afb4f7225bc895ad3f8cc5eba8aca376fe0d089.zip | |
Small patch for the win32 makefile that improves the dependencies and
prints out exactly which executable is being linked.
From Graham Bloice <graham.bloice@trihedral.com>
svn path=/trunk/; revision=2075
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index a5832f8286..5901735ba9 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: nmake -f makefile.nmake # -# $Id: Makefile.nmake,v 1.44 2000/06/12 02:38:13 guy Exp $ +# $Id: Makefile.nmake,v 1.45 2000/06/16 15:05:26 gram Exp $ include config.nmake @@ -213,19 +213,22 @@ EXECUTABLES=ethereal.exe tethereal.exe editcap.exe RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res -all: $(EXECUTABLES) $(RESOURCES) +all: wiretap gtk $(EXECUTABLES) $(RESOURCES) -ethereal.exe : config.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res wiretap gtk plugins +ethereal.exe : config.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res wiretap\libwtap.lib gtk\libui.lib plugins + @echo Linking $@ $(LINK) @<< - /OUT:ethereal.exe $(LDFLAGS) /SUBSYSTEM:windows $(ethereal_LIBS) $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res /NODEFAULTLIB:libcmt + /OUT:ethereal.exe $(LDFLAGS) /SUBSYSTEM:windows $(ethereal_LIBS) $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res << -tethereal.exe : config.h $(tethereal_OBJECTS) $(EXTRA_OBJECTS) image\tethereal.res wiretap plugins +tethereal.exe : config.h $(tethereal_OBJECTS) $(EXTRA_OBJECTS) image\tethereal.res wiretap\libwtap.lib plugins + @echo Linking $@ $(LINK) @<< - /OUT:tethereal.exe $(LDFLAGS) /SUBSYSTEM:console $(tethereal_LIBS) $(tethereal_OBJECTS) $(EXTRA_OBJECTS) image\tethereal.res /NODEFAULTLIB:libcmt + /OUT:tethereal.exe $(LDFLAGS) /SUBSYSTEM:console $(tethereal_LIBS) $(tethereal_OBJECTS) $(EXTRA_OBJECTS) image\tethereal.res << -editcap.exe : config.h editcap.obj getopt.obj wiretap image\editcap.res +editcap.exe : config.h editcap.obj getopt.obj wiretap\libwtap.lib image\editcap.res + @echo Linking $@ $(LINK) @<< /OUT:editcap.exe $(LDFLAGS) /SUBSYSTEM:console editcap.obj getopt.obj $(editcap_LIBS) image\editcap.res << |