Add Makefile.nmake files for new subdirs.

Add them to EXTRA_DIST in corresponding Makefile.am's so that they
get packaged with the distribution.

svn path=/trunk/; revision=2979
This commit is contained in:
Gilbert Ramirez 2001-02-02 04:03:43 +00:00
parent 9627904c2a
commit 95e09f5ac3
10 changed files with 144 additions and 24 deletions

View File

@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: nmake -f makefile.nmake
#
# $Id: Makefile.nmake,v 1.77 2001/01/28 04:43:24 guy Exp $
# $Id: Makefile.nmake,v 1.78 2001/02/02 04:03:37 gram Exp $
include config.nmake
@ -212,6 +212,7 @@ EXTRA_OBJECTS = \
mkstemp.obj
ethereal_LIBS= wiretap\libwtap.lib gtk\libui.lib epan\ethereal.lib \
epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
wsock32.lib user32.lib \
$(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \
$(GTK_DIR)\gdk\gdk-$(GTK_VERSION).lib \
@ -220,6 +221,7 @@ ethereal_LIBS= wiretap\libwtap.lib gtk\libui.lib epan\ethereal.lib \
$(PCAP_DIR)\lib\libpcap.lib
tethereal_LIBS= wiretap\libwtap.lib epan\ethereal.lib \
epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
wsock32.lib user32.lib \
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
$(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \
@ -233,7 +235,7 @@ EXECUTABLES=ethereal.exe tethereal.exe editcap.exe
RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res
all: wiretap gtk epan $(EXECUTABLES) $(RESOURCES)
all: tools wiretap gtk epan $(EXECUTABLES) $(RESOURCES)
ethereal.exe : config.h $(ethereal_OBJECTS) $(EXTRA_OBJECTS) image\ethereal.res wiretap\libwtap.lib gtk\libui.lib plugins
@echo Linking $@
@ -272,8 +274,7 @@ register.c: $(DISSECTOR_SOURCES)
clean:
rm -f $(ethereal_OBJECTS) $(EXTRA_OBJECTS) $(EXECUTABLES) \
tethereal.obj editcap.obj register.c dfilter-scanner.c \
dfilter-grammar.c dfilter-grammar.h rdps.obj
tethereal.obj editcap.obj register.c rdps.obj
cd wiretap
nmake -f Makefile.nmake clean
cd ../gtk
@ -282,6 +283,13 @@ clean:
nmake -f Makefile.nmake clean
cd ../plugins
nmake -f Makefile.nmake clean
cd ../tools
nmake -f Makefile.nmake clean
cd ..
tools::
cd tools
nmake -f Makefile.nmake
cd ..
wiretap::
@ -303,4 +311,3 @@ plugins::
cd plugins
nmake -f Makefile.nmake
cd ..

View File

@ -18,9 +18,6 @@ libethereal_LIBS = \
OBJECTS=bitswap.obj \
conversation.obj \
dfilter-grammar.obj \
dfilter-scanner.obj \
dfilter.obj \
epan.obj \
except.obj \
filesystem.obj \
@ -35,6 +32,9 @@ OBJECTS=bitswap.obj \
strutil.obj \
tvbuff.obj \
all: ftypes dfilter ethereal.lib
# For use when making ethereal.dll
#ethereal.dll ethereal.lib : config.h $(OBJECTS)
# link /DLL /out:ethereal.dll $(OBJECTS) $(libethereal_LIBS)
@ -42,16 +42,23 @@ OBJECTS=bitswap.obj \
ethereal.lib : config.h $(OBJECTS)
lib /out:ethereal.lib $(OBJECTS)
dfilter-scanner.obj : dfilter-scanner.c dfilter-grammar.h
dfilter-scanner.c : dfilter-scanner.l
$(LEX) -Pdfilter_ -odfilter-scanner.c dfilter-scanner.l
dfilter-grammar.c dfilter-grammar.h : dfilter-grammar.y
$(YACC) $(YACC_OPTS) -d -p dfilter_ dfilter-grammar.y -o dfilter-grammar.c
config.h : config.h.win32
copy config.h.win32 $@
clean:
rm -f $(OBJECTS) ethereal.lib
cd ftypes
nmake -f Makefile.nmake clean
cd ../dfilter
nmake -f Makefile.nmake clean
ftypes::
cd ftypes
nmake -f Makefile.nmake
cd ..
dfilter::
cd dfilter
nmake -f Makefile.nmake
cd ..

View File

@ -1,6 +1,6 @@
# Makefile.am
#
# $Id: Makefile.am,v 1.2 2001/02/01 20:31:18 gram Exp $
# $Id: Makefile.am,v 1.3 2001/02/02 04:03:40 gram Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
@ -58,14 +58,14 @@ libdfilter_a_SOURCES = \
syntax-tree.c \
syntax-tree.h
# Makefile.nmake
EXTRA_DIST = \
grammar.lemon \
lemonflex-head.inc \
lemonflex-tail.inc \
lemon.c \
lempar.c \
scanner.l
scanner.l \
Makefile.nmake
scanner.c : scanner.l
$(LEX) -Pdf_ -oscanner.c $(srcdir)/scanner.l

View File

@ -0,0 +1,48 @@
include ..\..\config.nmake
############### no need to modify below this line #########
LEMON=..\..\tools\lemon
CFLAGS=/MT /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 $(LOCAL_CFLAGS)
{$S}.c{$O}.obj::
$(CC) $(CFLAGS) -Fd$O\ -c $<
OBJECTS = \
dfilter.obj \
dfvm.obj \
gencode.obj \
glib-util.obj \
grammar.obj \
scanner.obj \
semcheck.obj \
sttype-pointer.obj \
sttype-range.obj \
sttype-string.obj \
sttype-test.obj \
syntax-tree.obj
dfilter.lib : $(OBJECTS)
lib /out:dfilter.lib $(OBJECTS)
clean:
rm -f $(OBJECTS) scanner.c grammar.c grammar.h grammar.out dfilter.lib
scanner.c : scanner.l
$(LEX) -Pdf_ -oscanner.c scanner.l
scanner.obj : scanner.c grammar.h
grammar.c grammar.h : grammar.lemon
$(LEMON)\lemon.exe t=$(LEMON)\lempar.c grammar.lemon

View File

@ -1,6 +1,6 @@
# Makefile.am
#
# $Id: Makefile.am,v 1.2 2001/02/01 20:31:21 gram Exp $
# $Id: Makefile.am,v 1.3 2001/02/02 04:03:41 gram Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
@ -46,6 +46,6 @@ libftypes_a_SOURCES = \
ftype-time.c \
ftype-tvbuff.c
#EXTRA_DIST = \
# Makefile.nmake
EXTRA_DIST = \
Makefile.nmake

View File

@ -0,0 +1,33 @@
include ..\..\config.nmake
############### no need to modify below this line #########
CFLAGS=/MT /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 \
/I$(PCAP_DIR)\include $(LOCAL_CFLAGS)
{$S}.c{$O}.obj::
$(CC) $(CFLAGS) -Fd$O\ -c $<
OBJECTS = \
ftypes.obj \
ftype-bytes.obj \
ftype-double.obj \
ftype-integer.obj \
ftype-ipv4.obj \
ftype-none.obj \
ftype-string.obj \
ftype-time.obj \
ftype-tvbuff.obj
ftypes.lib : $(OBJECTS)
lib /out:ftypes.lib $(OBJECTS)
clean:
rm -f $(OBJECTS) ftypes.lib

View File

@ -1 +1,4 @@
SUBDIRS = lemon
EXTRA_DIST = \
Makefile.nmake

13
tools/Makefile.nmake Executable file
View File

@ -0,0 +1,13 @@
all: lemon
clean:
cd lemon
nmake -f Makefile.nmake clean
lemon::
cd lemon
nmake -f Makefile.nmake
cd ..

View File

@ -1,6 +1,6 @@
# Makefile.am
#
# $Id: Makefile.am,v 1.1 2001/02/01 20:21:24 gram Exp $
# $Id: Makefile.am,v 1.2 2001/02/02 04:03:43 gram Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
@ -34,11 +34,11 @@ CLEANFILES = \
lemon_SOURCES = \
lemon.c
# Makefile.nmake
EXTRA_DIST = \
lemon.html \
lemonflex-head.inc \
lemonflex-tail.inc \
lempar.c \
Makefile.nmake \
README

View File

@ -0,0 +1,9 @@
all : lemon.exe
OBJECTS = lemon.obj
lemon.exe : $(OBJECTS)
clean:
rm $(OBJECTS) lemon.exe