diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-07-05 15:30:38 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-07-05 21:58:03 +0000 |
| commit | 21f5c53ae76fe1d57b12b248c1ff9691c0d9033e (patch) | |
| tree | 275b1e83f69b9283b7add6e96ee5e6a221bc3f9c | |
| parent | addf064a0fff031a2de8adfdf84a9934d3a06cb2 (diff) | |
| download | wireshark-21f5c53ae76fe1d57b12b248c1ff9691c0d9033e.tar.gz | |
Rename PIDL Makefile
Otherwise it will get overwritten by the in-tree cmake build.
Issue reported by Rémy Léone.
Change-Id: I0d908973386bcb70585f5e32c36456230967bb7f
Reviewed-on: https://code.wireshark.org/review/16305
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | epan/dissectors/pidl/Makefile.pidl (renamed from epan/dissectors/pidl/Makefile) | 0 | ||||
| -rw-r--r-- | epan/dissectors/pidl/README | 2 |
3 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index deebf83e06..f375a41d0f 100644 --- a/.gitignore +++ b/.gitignore @@ -114,7 +114,6 @@ tvbtest wireshark wmem_test ylwrap -!/epan/dissectors/pidl/Makefile # CMake # ################## diff --git a/epan/dissectors/pidl/Makefile b/epan/dissectors/pidl/Makefile.pidl index 66e8e5d2f7..66e8e5d2f7 100644 --- a/epan/dissectors/pidl/Makefile +++ b/epan/dissectors/pidl/Makefile.pidl diff --git a/epan/dissectors/pidl/README b/epan/dissectors/pidl/README index f275671db4..74cba21b09 100644 --- a/epan/dissectors/pidl/README +++ b/epan/dissectors/pidl/README @@ -4,7 +4,7 @@ A note about PIDL generated files Quick guide =========== -Run 'make all' inside the pidl folder to generate all the dissectors and place +Run 'make -f Makefile.pidl all' inside the pidl folder to generate all the dissectors and place them in the epan/dissectors folder. Complete infos |