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

Arrange that "x11-declarations.h" and "x11-register-info.h" be part of 

the distribution, as was the case in the past.

Arrange that RCS IDs be expanded, and that the EOL style be native, for
epan/dissectors/Makefile.{am,common,nmake}.

svn path=/trunk/; revision=11532
This commit is contained in:
Guy Harris 2004-07-27 02:52:49 +00:00
parent 0d7309988e
commit 1dff8e81b2
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/Makefile.am
View File

@ -114,8 +114,6 @@ EXTRA_DIST = \
CLEANFILES = \
libethereal.a \
libethereal.la \
x11-declarations.h \
x11-register-info.h \
*~
MAINTAINERCLEANFILES = \

6
epan/dissectors/Makefile.am
View File

@ -3,9 +3,8 @@
# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
# By Gerald Combs <gerald@ethereal.com>
# Copyright 2004 Gerald Combs
#
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@ -113,6 +112,5 @@ MAINTAINERCLEANFILES = \
CLEANFILES = \
libdissectors.a \
libdissectors.la \
x11-declarations.h \
x11-register-info.h \
$(GENERATED_HEADER_FILES) \
*~

11
epan/dissectors/Makefile.common
View File

@ -3,7 +3,7 @@
# a) common to both files and
# b) portable between both files
#
# $Id: Makefile.common 11400 2004-07-18 00:24:25Z guy $
# $Id$
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@ -23,6 +23,12 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# Generated header files that we want in the distribution.
#
GENERATED_HEADER_FILES = \
x11-declarations.h \
x11-register-info.h
# the dissector sources (without any helpers)
DISSECTOR_SRC = \
@ -691,7 +697,8 @@ DISSECTOR_INCLUDES = \
packet-ypbind.h \
packet-yppasswd.h \
packet-ypserv.h \
packet-ypxfr.h
packet-ypxfr.h \
$(GENERATED_HEADER_FILES)
# dissector helpers (needed from the dissectors, but not a dissector itself)
DISSECTOR_SUPPORT_SRC = \

6
epan/dissectors/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 11400 2004-07-18 00:24:25Z guy $
# $Id$
include ..\..\config.nmake
@ -24,7 +24,7 @@ DISSECTOR_OBJECTS = $(DISSECTOR_SRC:.c=.obj)
DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
#dissectors.lib: ../../config.h $(DISSECTOR_OBJECTS) $(EXTRA_OBJECTS)
dissectors.lib: register.obj packet-ncp2222.c x11-declarations.h x11-register-info.h ../../config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
dissectors.lib: register.obj packet-ncp2222.c $(GENERATED_HEADER_FILES) ../../config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
@echo Linking dissectors.lib
link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
@ -100,4 +100,4 @@ clean:
distclean: clean
rm -f $(BUILT_SOURCES) packet-ncp2222.c \
register.c x11-declarations.h x11-register-info.h
register.c $(GENERATED_HEADER_FILES)