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

Treat runlex.sh-generated headers differently from Flex-generated .c 

files - for one thing, the former aren't compiled into .o or .obj files.

svn path=/trunk/; revision=22452
This commit is contained in:
Guy Harris 2007-08-04 08:04:17 +00:00
parent 5238bd07f1
commit 71070dd6d8
3 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/Makefile.am
View File

@ -65,7 +65,8 @@ libwireshark_la_SOURCES = \
libwireshark_la_CFLAGS = $(AM_NON_GENERATED_CFLAGS)
libwireshark_generated_la_SOURCES = \
$(LIBWIRESHARK_GENERATED_SRC)
$(LIBWIRESHARK_GENERATED_SRC) \
$(LIBWIRESHARK_GENERATED_INCLUDES)
EXTRA_libwireshark_la_SOURCES = \
g_ascii_strtoull.c \
@ -100,11 +101,12 @@ CLEANFILES = \
DISTCLEANFILES = \
$(LIBWIRESHARK_DISTCLEAN_GENERATED_SRC) \
dtd_grammar.h \
$(LIBWIRESHARK_DISTCLEAN_GENERATED_INCLUDES) \
dtd_grammar.out
MAINTAINERCLEANFILES = \
$(LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC) \
$(LIBWIRESHARK_NODISTCLEAN_GENERATED_INCLUDES) \
Makefile.in \
sminmpec.c

30
epan/Makefile.common
View File

@ -111,15 +111,10 @@ LIBWIRESHARK_DISTCLEAN_GENERATED_SRC = \
#
LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC = \
diam_dict.c \
diam_dict_lex.h \
dtd_parse.c \
dtd_parse_lex.h \
dtd_preparse.c \
dtd_preparse_lex.h \
radius_dict.c \
radius_dict_lex.h \
uat_load.c \
uat_load_lex.h
uat_load.c
LIBWIRESHARK_GENERATED_SRC = \
$(LIBWIRESHARK_DISTCLEAN_GENERATED_SRC) \
@ -158,7 +153,6 @@ LIBWIRESHARK_INCLUDES = \
crcdrm.h \
diam_dict.h \
dtd.h \
dtd_grammar.h \
dtd_parse.h \
emem.h \
epan.h \
@ -235,3 +229,25 @@ LIBWIRESHARK_INCLUDES = \
x264_prt_id.h \
xdlc.h \
xmlstub.h
#
# As with LIBWIRESHARK_DISTCLEAN_GENERATED_SRC, so with
# LIBWIRESHARK_DISTCLEAN_GENERATED_INCLUDES.
#
LIBWIRESHARK_DISTCLEAN_GENERATED_SRC = \
dtd_grammar.h
#
# As with LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC, so with
# LIBWIRESHARK_NODISTCLEAN_GENERATED_INCLUDES.
#
LIBWIRESHARK_NODISTCLEAN_GENERATED_INCLUDES = \
diam_dict_lex.h \
dtd_parse_lex.h \
dtd_preparse_lex.h \
radius_dict_lex.h \
uat_load_lex.h
LIBWIRESHARK_GENERATED_INCLUDES = \
$(LIBWIRESHARK_DISTCLEAN_GENERATED_INCLUDES) \
$(LIBWIRESHARK_NODISTCLEAN_GENERATED_INCLUDES)

4
epan/Makefile.nmake
View File

@ -129,8 +129,10 @@ distclean: clean
rm -f config.h register.c mkstemp.c strptime.c \
inet_ntop.c inet_pton.c \
$(LIBWIRESHARK_DISTCLEAN_GENERATED_SRC) \
$(LIBWIRESHARK_DISTCLEAN_GENERATED_INCLUDES) \
$(LIBWIRESHARK_NODISTCLEAN_GENERATED_SRC) \
dtd_grammar.out dtd_grammar.h sminmpec.c
$(LIBWIRESHARK_NODISTCLEAN_GENERATED_INCLUDES) \
dtd_grammar.out sminmpec.c
cd crypt
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../ftypes