diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-02-19 23:30:03 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-02-19 23:30:03 +0000 |
| commit | d7ed0237c468b365e1f0e2340a05ffa8276f74eb (patch) | |
| tree | 956a1f03dc38e40d44dc141f1f873ff72f019800 | |
| parent | 82a10ad34d2b72cb6a22034ae3c50070caa216c7 (diff) | |
(Minor): use GLIB_CFLAGS instead of GTK_CFLAGS; also put libcliui: as first target
svn path=/trunk/; revision=41078
| -rw-r--r-- | ui/cli/Makefile.nmake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ui/cli/Makefile.nmake b/ui/cli/Makefile.nmake index a772facfd6..fa0ddd794c 100644 --- a/ui/cli/Makefile.nmake +++ b/ui/cli/Makefile.nmake @@ -12,7 +12,7 @@ include ..\..\Makefile.nmake.inc GENERATED_CFLAGS=\ $(STANDARD_CFLAGS) \ -D_NEED_VAR_IMPORT_ /Zm800 \ - /I../.. /I../../wiretap $(GTK_CFLAGS) $(GNUTLS_CFLAGS) \ + /I../.. /I../../wiretap $(GLIB_CFLAGS) $(GNUTLS_CFLAGS) \ /I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \ /I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \ /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \ @@ -30,6 +30,10 @@ include Makefile.common # if you add files here, be sure to include them also in Makefile.am EXTRA_DIST TSHARK_TAP_OBJECTS = $(TSHARK_TAP_SRC:.c=.obj) + +libcliui.lib : ..\..\config.h $(TSHARK_TAP_OBJECTS) tshark-tap-register.obj + link /lib /out:libcliui.lib $(TSHARK_TAP_OBJECTS) tshark-tap-register.obj + # # Build "tshark-tap-register.c", which contains a function # "register_all_tap_listeners()" @@ -49,9 +53,6 @@ tshark-tap-register.c: $(TSHARK_TAP_SRC) ..\..\tools\make-tapreg-dotc @echo Making tshark-tap-register.c @$(SH) ../../tools/make-tapreg-dotc tshark-tap-register.c . $(TSHARK_TAP_SRC) -libcliui.lib : ..\..\config.h $(TSHARK_TAP_OBJECTS) tshark-tap-register.obj - link /lib /out:libcliui.lib $(TSHARK_TAP_OBJECTS) tshark-tap-register.obj - clean: rm -f $(TSHARK_TAP_OBJECTS) tshark-tap-register.obj libcliui.lib *.pdb doxygen.cfg html/*.* wireshark-tap-register-cache.pkl if exist html rmdir html |