Create proper dependancies for plugin.c

[obnox/wireshark/wip.git] / plugins / pcli / Makefile.nmake

diff --git a/plugins/pcli/Makefile.nmake b/plugins/pcli/Makefile.nmake
index 4e89cf9b32317e7b127809fa70f12ef6cb4de393..3f5af4f39bc5836d033e6e77ccd00c1e9113882a 100644 (file)
--- a/plugins/pcli/Makefile.nmake
+++ b/plugins/pcli/Makefile.nmake
@@ -9,10 +9,13 @@ include moduleinfo.nmake
 
 include Makefile.common
 
-CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
+CFLAGS=/WX /DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
        /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
-LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
+.c.obj::
+       $(CC) $(CFLAGS) -Fd.\ -c $<
+       
+LDFLAGS = $(PLUGIN_LDFLAGS)
 
 !IFDEF ENABLE_LIBWIRESHARK
 LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib
@@ -35,11 +38,13 @@ $(PLUGIN_NAME).rc : moduleinfo.nmake
        -e s/@MODULE_VERSION@/$(MODULE_VERSION)/ \
        -e s/@PACKAGE@/$(PACKAGE)/ \
        -e s/@VERSION@/$(VERSION)/ \
+       -e s/@MSVC_VARIANT@/$(MSVC_VARIANT)/ \
        < plugin.rc.in > $@
 
 $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLUGIN_WITH) $(RESOURCE)
        link -dll /out:$(PLUGIN_NAME).dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
        $(GLIB_LIBS) $(RESOURCE)
+
 #
 # Build plugin.c, which contains the plugin version[] string, a
 # function plugin_register() that calls the register routines for all
@@ -73,11 +78,12 @@ $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp $(PLUGIN_NAME).lib : $(OBJECTS) $(LINK_PLU
 # a plugin.c file for a plugin.
 # All subsequent arguments are the files to scan.
 #
-plugin.c: $(DISSECTOR_SRC)
 !IFDEF PYTHON
+plugin.c: $(DISSECTOR_SRC) moduleinfo.h ../../tools/make-dissector-reg.py
        @echo Making plugin.c (using python)
        @$(PYTHON) "../../tools/make-dissector-reg.py" . plugin $(DISSECTOR_SRC)
 !ELSE
+plugin.c: $(DISSECTOR_SRC) moduleinfo.h ../../tools/make-dissector-reg
        @echo Making plugin.c (using sh)
        @$(SH) ../../tools/make-dissector-reg . plugin $(DISSECTOR_SRC)
 !ENDIF
@@ -85,8 +91,9 @@ plugin.c: $(DISSECTOR_SRC)
 !ENDIF
 
 clean:
-       rm -f $(OBJECTS) $(PLUGIN_NAME).dll $(PLUGIN_NAME).exp \
-           $(RESOURCE) $(PLUGIN_NAME).rc $(PLUGIN_NAME).lib *.pdb
+       rm -f $(OBJECTS) $(RESOURCE) plugin.c *.pdb \
+           $(PLUGIN_NAME).dll $(PLUGIN_NAME).dll.manifest $(PLUGIN_NAME).lib \
+           $(PLUGIN_NAME).exp $(PLUGIN_NAME).rc 
 
 distclean: clean