osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Define GLIB_CFLAGS and GTK_CFLAGS variables in config.nmake (based on 

variables the user configures - the user isn't expected to change
GLIB_CFLAGS or GTK_CFLAGS, and there's a comment nothing that users
shouldn't have to do so), which contain the appropriate "/I" flags for
building stuff that requires only GLib, and stuff that required GTK+ and
GLib, respectively, and use those macros in the Makefile.nmake files.

svn path=/trunk/; revision=7884
This commit is contained in:
Guy Harris 2003-06-14 20:36:04 +00:00
parent 25bd670668
commit 71424053cd
16 changed files with 43 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.nmake
View File

@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
# $Id: Makefile.nmake,v 1.308 2003/06/13 22:31:11 guy Exp $
# $Id: Makefile.nmake,v 1.309 2003/06/14 20:35:55 guy Exp $
include config.nmake
include <win32.mak>
@ -13,8 +13,7 @@ LINK= link
LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) /I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule \
/I$(GTK_DIR) /I. /Iwiretap /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GTK_CFLAGS) /I. /Iwiretap \
/I$(ZLIB_DIR) /I$(PCAP_DIR)\include \
/I$(NET_SNMP_DIR)\include /I$(NET_SNMP_DIR)\win32 \
/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32 \

14
config.nmake
View File

@ -1,4 +1,4 @@
# $Id: config.nmake,v 1.43 2003/06/14 03:23:21 guy Exp $
# $Id: config.nmake,v 1.44 2003/06/14 20:35:55 guy Exp $
VERSION=0.9.13
#
@ -57,3 +57,15 @@ YACC=bison
# To build the installer
MAKENSIS="C:/program files/nsis/makensis.exe"
#
# You should not have to change anything below this comment.
# If you do, it's a deficiency in the Makefile.nmake files;
# either tell ethereal-dev@ethereal.com about it, including
# details of why you had to change it, or fix config.nmake
# and any Makefile.nmake files that need to be changed, and
# send us the patches, along with details of why the change
# was necessary.
#
GLIB_CFLAGS=/I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule
GTK_CFLAGS=/I$(GTK_DIR) /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 $(GLIB_CFLAGS)

6
epan/Makefile.nmake
View File

@ -1,15 +1,13 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
# $Id: Makefile.nmake,v 1.26 2003/06/13 22:45:15 guy Exp $
# $Id: Makefile.nmake,v 1.27 2003/06/14 20:35:56 guy Exp $
include ..\config.nmake
############### no need to modify below this line #########
CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GTK_CFLAGS) \
!IFDEF ADNS_DIR
/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32 \
!ENDIF

6
epan/dfilter/Makefile.nmake
View File

@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
# $Id: Makefile.nmake,v 1.8 2002/02/27 09:42:41 guy Exp $
# $Id: Makefile.nmake,v 1.9 2003/06/14 20:35:56 guy Exp $
include ..\..\config.nmake
@ -10,9 +10,7 @@ include ..\..\config.nmake
LEMON=..\..\tools\lemon
CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I..\.. /I$(LEMON) \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)\gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
$(GTK_CFLAGS) /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL

6
epan/ftypes/Makefile.nmake
View File

@ -1,15 +1,13 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
# $Id: Makefile.nmake,v 1.4 2002/02/27 09:42:42 guy Exp $
# $Id: Makefile.nmake,v 1.5 2003/06/14 20:35:57 guy Exp $
include ..\..\config.nmake
############### no need to modify below this line #########
CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../.. \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../.. $(GTK_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL

6
gtk/Makefile.nmake
View File

@ -1,15 +1,13 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
# $Id: Makefile.nmake,v 1.43 2003/04/25 20:54:18 guy Exp $
# $Id: Makefile.nmake,v 1.44 2003/06/14 20:35:57 guy Exp $
include ..\config.nmake
############### no need to modify below this line #########
CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap $(GTK_CFLAGS) \
/I$(ZLIB_DIR) \
/I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
/I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \

6
plugins/Makefile.nmake
View File

@ -1,14 +1,12 @@
#
# $Id: Makefile.nmake,v 1.18 2003/06/11 09:17:02 guy Exp $
# $Id: Makefile.nmake,v 1.19 2003/06/14 20:35:58 guy Exp $
#
include ..\config.nmake
############### no need to modify below this line #########
CFLAGS=/DHAVE_CONFIG_H /I.. /I../wiretap /I. \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
CFLAGS=/DHAVE_CONFIG_H /I.. /I../wiretap /I. $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
OBJECTS=plugin_api.obj

6
plugins/artnet/Makefile.nmake
View File

@ -1,14 +1,12 @@
#
# $Id: Makefile.nmake,v 1.1 2003/04/21 21:28:39 guy Exp $
# $Id: Makefile.nmake,v 1.2 2003/06/14 20:35:59 guy Exp $
#
include ..\..\config.nmake
############### no need to modify below this line #########
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
OBJECTS=packet-artnet.obj

6
plugins/docsis/Makefile.nmake
View File

@ -1,14 +1,12 @@
#
# $Id: Makefile.nmake,v 1.3 2002/09/10 19:07:37 guy Exp $
# $Id: Makefile.nmake,v 1.4 2003/06/14 20:35:59 guy Exp $
#
include ..\..\config.nmake
############### no need to modify below this line #########
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
OBJECTS=packet-docsis.obj packet-bpkmattr.obj \

6
plugins/giop/Makefile.nmake
View File

@ -1,14 +1,12 @@
#
# $Id: Makefile.nmake,v 1.6 2002/02/27 09:42:46 guy Exp $
# $Id: Makefile.nmake,v 1.7 2003/06/14 20:36:01 guy Exp $
#
include ..\..\config.nmake
############### no need to modify below this line #########
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
OBJECTS=packet-cosnaming.obj packet-coseventcomm.obj

6
plugins/gryphon/Makefile.nmake
View File

@ -1,14 +1,12 @@
#
# $Id: Makefile.nmake,v 1.9 2003/06/12 10:12:21 guy Exp $
# $Id: Makefile.nmake,v 1.10 2003/06/14 20:36:01 guy Exp $
#
include ..\..\config.nmake
############### no need to modify below this line #########
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
OBJECTS=packet-gryphon.obj

6
plugins/megaco/Makefile.nmake
View File

@ -1,14 +1,12 @@
#
# $Id: Makefile.nmake,v 1.1 2003/01/14 23:53:40 guy Exp $
# $Id: Makefile.nmake,v 1.2 2003/06/14 20:36:02 guy Exp $
#
include ..\..\config.nmake
############### no need to modify below this line #########
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
OBJECTS=packet-megaco.obj

6
plugins/mgcp/Makefile.nmake
View File

@ -1,14 +1,12 @@
#
# $Id: Makefile.nmake,v 1.5 2002/02/27 09:42:48 guy Exp $
# $Id: Makefile.nmake,v 1.6 2003/06/14 20:36:03 guy Exp $
#
include ..\..\config.nmake
############### no need to modify below this line #########
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
OBJECTS=packet-mgcp.obj

6
plugins/pcli/Makefile.nmake
View File

@ -1,14 +1,12 @@
#
# $Id: Makefile.nmake,v 1.1 2002/10/03 02:56:59 hagbard Exp $
# $Id: Makefile.nmake,v 1.2 2003/06/14 20:36:03 guy Exp $
#
include ..\..\config.nmake
############### no need to modify below this line #########
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
OBJECTS=packet-pcli.obj

6
plugins/rtnet/Makefile.nmake
View File

@ -1,14 +1,12 @@
#
# $Id: Makefile.nmake,v 1.2 2003/06/11 14:40:17 gerald Exp $
# $Id: Makefile.nmake,v 1.3 2003/06/14 20:36:04 guy Exp $
#
include ..\..\config.nmake
############### no need to modify below this line #########
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
OBJECTS=packet-rtnet.obj

4
wiretap/Makefile.nmake
View File

@ -1,5 +1,5 @@
#
# $Id: Makefile.nmake,v 1.28 2002/07/31 19:27:56 guy Exp $
# $Id: Makefile.nmake,v 1.29 2003/06/14 20:36:04 guy Exp $
#
include ..\config.nmake
@ -7,7 +7,7 @@ include <win32.mak>
############### no need to modify below this line #########
CFLAGS=-DHAVE_CONFIG_H /I$(GLIB_DIR) /I$(ZLIB_DIR) /I$(PCAP_DIR)/include \
CFLAGS=-DHAVE_CONFIG_H $(GLIB_CFLAGS) /I$(ZLIB_DIR) /I$(PCAP_DIR)/include \
-D_U_="" $(LOCAL_CFLAGS)
.c.obj::