diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-12 23:02:34 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-12 23:02:34 +0000 |
| commit | c517919f94216ac8197872182f50291cf293c596 (patch) | |
| tree | dccd053b09996b8238da44b0549d768fbf8a3df2 /epan/dissectors/Makefile.nmake | |
| parent | b4ed6c5aa50888568ff0b20b11b2b30b282de285 (diff) | |
Move all of the scripts in epan/dissectors/ to tools/ .
Add a target ("x11-dissector") to build the X11 dissector.
Put the X11-related files (back) in the source distribution.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29871 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/Makefile.nmake')
| -rw-r--r-- | epan/dissectors/Makefile.nmake | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake index 7e3f563a2e..2c94518332 100644 --- a/epan/dissectors/Makefile.nmake +++ b/epan/dissectors/Makefile.nmake @@ -17,7 +17,7 @@ CFLAGS=-WX -DHAVE_CONFIG_H /I. /I.. /I../.. $(GLIB_CFLAGS) \ $(KFW_CFLAGS) $(AIRPCAP_CFLAGS) $(GEOIP_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) -CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL +CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL .c.obj:: $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $< @@ -29,8 +29,8 @@ DISSECTOR_SUPPORT_OBJECTS = \ $(DISSECTOR_SUPPORT_SRC:.c=.obj) dissectors.lib: register.obj packet-ncp2222.c $(GENERATED_HEADER_FILES) ../../config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) - @echo Linking dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) - link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) + @echo Linking dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) + link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) !IF "$(MSVC_VARIANT)" != "MSVC2005EE" && "$(MSVC_VARIANT)" != "MSVC2005" && "$(MSVC_VARIANT)" != "MSVC2008EE" && "$(MSVC_VARIANT)" != "MSVC2008" # Disable debug for large dissectors @@ -81,10 +81,10 @@ register.c: $(ALL_DISSECTORS_SRC) @$(SH) ../../tools/make-dissector-reg . dissectors $(ALL_DISSECTORS_SRC) \ !ENDIF -packet-ncp2222.c : ncp2222.py +packet-ncp2222.c : ../../tools/ncp2222.py !IFDEF PYTHON @echo Making packet-ncp2222.c - $(PYTHON) ncp2222.py -o packet-ncp2222.c + $(PYTHON) ../../tools/ncp2222.py -o packet-ncp2222.c !ELSE @echo Faking packet-ncp2222.c... @echo Python is required to build the NCP disector @@ -95,6 +95,12 @@ packet-ncp2222.c : ncp2222.py packet-ncp2222.obj: packet-ncp2222.inc +# Target to rebuild the X11 dissector header files. +# See README.X11 before using this--it requires the xcb and mesa source. +x11-dissector: ../../tools/process-x11-fields.pl x11-fields ../../tools/process-x11-xcb.pl + $(PERL) ../../tools/process-x11-fields.pl < x11-fields + $(PERL) ../../tools/process-x11-xcb.pl + clean: rm -f dissectors.lib *.pdb register.c-tmp register-cache.pkl \ $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) |