Create a libui (static) library in the ui directory, which contains the

object files from all the source files in the ui directory (but not in
its subdirectories), and link the programs that need it with them.

This cleans things up a little bit, and may also fix the Windows build.

svn path=/trunk/; revision=41061

1 files changed, 80 insertions, 0 deletions

diff --git a/ui/Makefile.nmake b/ui/Makefile.nmake
new file mode 100644
index 0000000000..d699c67461
--- /dev/null
+++ b/ui/Makefile.nmake
@@ -0,0 +1,80 @@
+## Makefile for building wireshark.exe with Microsoft C and nmake
+## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
+#
+# $Id$
+
+include ..\config.nmake
+include ..\Makefile.nmake.inc
+
+############### no need to modify below this line #########
+
+# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
+GENERATED_CFLAGS=\
+	$(STANDARD_CFLAGS) \
+	-D_NEED_VAR_IMPORT_ /Zm800 \
+	/I.. /I../wiretap $(GTK_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) \
+	$(PORTAUDIO_CFLAGS) $(GEOIP_CFLAGS) \
+	$(HHC_CFLAGS)
+
+CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
+
+.c.obj::
+	$(CC) $(CVARSDLL) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $<
+
+include Makefile.common
+
+
+# if you add files here, be sure to include them also in Makefile.am EXTRA_DIST
+WIRESHARK_UI_SRC = \
+	$(WIRESHARK_UI_SRC) \
+	$(GENERATED_C_FILES)
+
+WIRESHARK_UI_OBJECTS = \
+	$(WIRESHARK_UI_SRC:.c=.obj) \
+	$(DIRTY_GENERATED_C_FILES:.c=.obj)
+
+libui.lib	: ..\config.h $(WIRESHARK_UI_OBJECTS)
+	link /lib /out:libui.lib $(WIRESHARK_UI_OBJECTS)
+
+clean:
+	rm -f $(WIRESHARK_UI_OBJECTS) $(WIRESHARK_TAP_OBJECTS) libui.lib *.pdb doxygen.cfg html/*.* wireshark-tap-register-cache.pkl
+	if exist html rmdir html
+
+distclean: clean
+
+maintainer-clean: distclean
+	rm -f $(GENERATED_FILES)
+
+# convert doxygen.cfg.in to doxygen.cfg with stamped version info
+doxygen.cfg: ..\config.nmake doxygen.cfg.in
+!IFDEF DOXYGEN
+	sed -e s/@VERSION@/$(VERSION)/ \
+	    < doxygen.cfg.in > $@
+!ENDIF
+
+doxygen-run:
+!IFDEF DOXYGEN
+	$(DOXYGEN) doxygen.cfg
+!ENDIF
+
+# MS html help compiler hhc returns 1 on success, but as nmake expects 0 it would stop here.
+# the prepended -1 will raise the accepted error levels of nmake, so it will continue
+doxygen.chm:
+!IFDEF HHC
+	-1 $(HHC) html\index.hhp
+!ENDIF
+
+doxygen: doxygen.cfg doxygen-run doxygen.chm
+
+checkapi: checkapi-base checkapi-todo
+
+checkapi-base:
+	$(PERL) ../tools/checkAPIs.pl -g deprecated-gtk \
+	$(WIRESHARK_UI_SRC)
+
+checkapi-todo:
+	$(PERL) ../tools/checkAPIs.pl -M -g deprecated-gtk-todo \
+	$(WIRESHARK_UI_SRC)