Add on to the dummy.cpp hack that forces wireshark to be linked with a

c++ compiler to automatically create a dummy.cpp file and remove it when
make clean is issued.  This allows make tags to work again since the
file isn't missing.

Change-Id: I17191ad2acc281734fa12da4d347fd3116018f67
Reviewed-on: https://code.wireshark.org/review/5494
Petri-Dish: Stephen Fisher <sfisher@sdf.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
This commit is contained in:
Stephen Fisher 2014-11-25 14:44:03 -07:00
parent e2132f9b15
commit e2ef6c4cfc
2 changed files with 7 additions and 0 deletions

1
.gitignore vendored
View File

@ -209,6 +209,7 @@ ui/qt/config.pri
*~
.DS_Store
cscope.*
dummy.cpp
tags
TAGS
macosx-support-libs

View File

@ -452,6 +452,11 @@ endif
nodist_EXTRA_wireshark_cxx_SOURCES = dummy.cpp
wireshark_cxx_SOURCES =
dummy.cpp:
echo 'static void dummy();' > $@
# Generate the dummy.cpp for above so that "make tags" will still work.
# ("make clean" will remove it.)
if ENABLE_STATIC
tshark_LDFLAGS = -Wl,-static -all-static
else
@ -691,6 +696,7 @@ services:
CLEANFILES = \
*~ \
doxygen-core.tag \
dummy.cpp \
vgcore.*
#