change nmake makefiles in /trunk and /trunk/epan so that

object code for libethereal.dll isn't generated by the
makefile in /trunk.

Having no code in /trunk linked into libethereal.dll
anymore, the definition of the macro _NEED_VAR_IMPORT_
can be moved from various source files in /trunk to /trunk/Makefile.nmake .
So do that, too.

svn path=/trunk/; revision=13389

19 files changed, 17 insertions, 73 deletions

diff --git a/Makefile.nmake b/Makefile.nmake
index 826378b2e7..8c0f29f84e 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -16,7 +16,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GLIB_CFLAGS) /I. /Iwiretap \
 	$(ZLIB_CFLAGS) /I$(PCAP_DIR)\include \
 	/I$(NET_SNMP_DIR)\include /I$(NET_SNMP_DIR)\win32 \
-	$(ADNS_CFLAGS) $(PCRE_CFLAGS) -D_U_=""
+	$(ADNS_CFLAGS) $(PCRE_CFLAGS) -D_U_="" -D_NEED_VAR_IMPORT_
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 
@@ -346,7 +346,7 @@ gtk2:: help config.h svnversion.h AUTHORS-SHORT
 	$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake GTK_CFLAGS="$(GTK2_CFLAGS)" GTK_LIBS="$(GTK2_LIBS)" libui.lib
 	cd ..
 
-epan:: $(EXTRA_OBJECTS) $(RESOURCES) $(BUILT_SOURCES) doxygen
+epan:: $(RESOURCES) $(BUILT_SOURCES) doxygen
 	cd epan
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..
diff --git a/alert_box.c b/alert_box.c
index 7f3c14826f..911ae255e5 100644
--- a/alert_box.c
+++ b/alert_box.c
@@ -23,10 +23,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/* With MSVC and a libethereal.dll this file needs to import some variables 
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */   
-#define _NEED_VAR_IMPORT_
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/capture.c b/capture.c
index 26bf74829a..2a206c6333 100644
--- a/capture.c
+++ b/capture.c
@@ -22,10 +22,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/* With MSVC and a libethereal.dll this file needs to import some variables 
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */
-#define _NEED_VAR_IMPORT_
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/capture_sync.c b/capture_sync.c
index 098f921959..7134dcd2d1 100644
--- a/capture_sync.c
+++ b/capture_sync.c
@@ -22,10 +22,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/* With MSVC and a libethereal.dll this file needs to import some variables 
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */
-#define _NEED_VAR_IMPORT_
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/capture_ui_utils.c b/capture_ui_utils.c
index 561f5289ab..1bbcb02558 100644
--- a/capture_ui_utils.c
+++ b/capture_ui_utils.c
@@ -22,10 +22,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/* With MSVC and a libethereal.dll this file needs to import some variables
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */
-#define _NEED_VAR_IMPORT_
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/color_filters.c b/color_filters.c
index 6382cef405..f76e4036d1 100644
--- a/color_filters.c
+++ b/color_filters.c
@@ -24,10 +24,6 @@
 /*
  * Updated 1 Dec 10 jjm
  */
-
-/* With MSVC and a libethereal.dll this file needs to import some variables 
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */  
-#define _NEED_VAR_IMPORT_ 
  
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/dftest.c b/dftest.c
index 42a7cd5d17..b567685ce6 100644
--- a/dftest.c
+++ b/dftest.c
@@ -22,10 +22,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
- 
-/* With MSVC and a libethereal.dll this file needs to import some variables 
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */  
-#define _NEED_VAR_IMPORT_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index f3a7802112..3c09327b2b 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -39,8 +39,8 @@ EXTRA_OBJECTS = \
 	inet_aton.obj	\
 	inet_pton.obj	\
 	inet_ntop.obj	\
-	../mkstemp.obj	\
-	../strptime.obj
+	mkstemp.obj	\
+	strptime.obj
 
 
 !IFDEF ENABLE_LIBETHEREAL
@@ -84,7 +84,7 @@ clean:
 	cd ..
 
 distclean: clean
-	rm -f config.h register.c
+	rm -f config.h register.c mkstemp.c strptime.c
 	cd ftypes
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ../dfilter
@@ -119,3 +119,15 @@ doxygen-run:
 
 doxygen: doxygen.cfg doxygen-run
 
+
+# (Windows only) Copy some sources from /trunk to /trunk/epan.
+# It is a cleaner to compile these sources seperately with this makefile than
+# using the object code compiled by the makefile in /trunk for both dynamically
+# and statically linking
+
+mkstemp.c: ..\mkstemp.c
+	xcopy ..\mkstemp.c . /d /y
+
+strptime.c: ..\strptime.c
+	xcopy ..\strptime.c . /d /y
+
diff --git a/file.c b/file.c
index 85cfbb91fa..01d06f5444 100644
--- a/file.c
+++ b/file.c
@@ -22,10 +22,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/* With MSVC and a libethereal.dll this file needs to import some variables 
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */
-#define _NEED_VAR_IMPORT_
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c
index 4eb2073a6c..f591e175a8 100644
--- a/gtk/capture_if_dlg.c
+++ b/gtk/capture_if_dlg.c
@@ -22,10 +22,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/* With MSVC and a libethereal.dll this file needs to import some variables 
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */
-/*#define _NEED_VAR_IMPORT_*/
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/print.c b/print.c
index a95e3c859b..9c5f8f0f63 100644
--- a/print.c
+++ b/print.c
@@ -24,10 +24,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/* With MSVC and a libethereal.dll this file needs to import some variables 
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */  
-#define _NEED_VAR_IMPORT_
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/tap-ansi_astat.c b/tap-ansi_astat.c
index 6487ae1b85..b2fc6e0bac 100644
--- a/tap-ansi_astat.c
+++ b/tap-ansi_astat.c
@@ -28,10 +28,6 @@
  * This TAP provides statistics for the ANSI A Interface:
  */
 
-/* With MSVC and a libethereal.dll this file needs to import some variables 
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */   
-#define _NEED_VAR_IMPORT_
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/tap-gsm_astat.c b/tap-gsm_astat.c
index ae3bedae6b..91895d9f3a 100644
--- a/tap-gsm_astat.c
+++ b/tap-gsm_astat.c
@@ -28,10 +28,6 @@
  * This TAP provides statistics for the GSM A Interface:
  */
 
-/* With MSVC and a libethereal.dll this file needs to import some variables 
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */ 
-#define _NEED_VAR_IMPORT_
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/tap-h225counter.c b/tap-h225counter.c
index 35e83b5628..d487aea0a1 100644
--- a/tap-h225counter.c
+++ b/tap-h225counter.c
@@ -23,10 +23,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/* With MSVC and a libethereal.dll this file needs to import some variables 
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */  
-#define _NEED_VAR_IMPORT_
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/tap-rpcstat.c b/tap-rpcstat.c
index a7cb42e1a1..ec188af03f 100644
--- a/tap-rpcstat.c
+++ b/tap-rpcstat.c
@@ -28,10 +28,6 @@
  * It serves as an example on how to use the tap api.
  */
 
-/* With MSVC and a libethereal.dll this file needs to import some variables 
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */  
-#define _NEED_VAR_IMPORT_
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/tap-smbsids.c b/tap-smbsids.c
index 234ce09ccc..867f668c04 100644
--- a/tap-smbsids.c
+++ b/tap-smbsids.c
@@ -22,10 +22,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/* With MSVC and a libethereal.dll this file needs to import some variables 
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */   
-#define _NEED_VAR_IMPORT_
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/tap-smbstat.c b/tap-smbstat.c
index c077f83d19..8e9b74f1b4 100644
--- a/tap-smbstat.c
+++ b/tap-smbstat.c
@@ -22,10 +22,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/* With MSVC and a libethereal.dll this file needs to import some variables 
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */  
-#define _NEED_VAR_IMPORT_
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/tap-wspstat.c b/tap-wspstat.c
index 8fe193e538..64c5125527 100644
--- a/tap-wspstat.c
+++ b/tap-wspstat.c
@@ -27,10 +27,6 @@
  *
  */
 
-/* With MSVC and a libethereal.dll this file needs to import some variables 
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */   
-#define _NEED_VAR_IMPORT_
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
diff --git a/tethereal.c b/tethereal.c
index 41b14b37d3..e7a8a43fda 100644
--- a/tethereal.c
+++ b/tethereal.c
@@ -24,10 +24,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-/* With MSVC and a libethereal.dll this file needs to import some variables 
-   in a special way. Therefore _NEED_VAR_IMPORT_ is defined. */
-#define _NEED_VAR_IMPORT_
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif