| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From d22ddc73f00ed056032a635ee8379305ec83bf81 Mon Sep 17 00:00:00 2001 |
| 2 | From: Robert Yang <liezhi.yang@windriver.com> |
| 3 | Date: Wed, 11 Jul 2018 12:02:50 +0800 |
| 4 | Subject: [PATCH] plugins/Makefile.am: fix for automake 1.16.1 |
| 5 | |
| 6 | Fixed: |
| 7 | | i586-poky-linux-gcc: error: netflowPlugin.o: No such file or directory |
| 8 | | i586-poky-linux-gcc: error: unrecognized command line option '-flat_namespace'; did you mean '-Wnamespaces'? |
| 9 | | i586-poky-linux-gcc: fatal error: no input files |
| 10 | |
| 11 | The previous code make things complicated, but we don't have to, let libtool do |
| 12 | most of the things can fix the problem. |
| 13 | |
| 14 | Upstream-Status: Pending [ntop is not longer maintained any more, we need consider moving to ntopng] |
| 15 | |
| 16 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 17 | --- |
| 18 | plugins/Makefile.am | 34 ++++++---------------------------- |
| 19 | 1 file changed, 6 insertions(+), 28 deletions(-) |
| 20 | |
| 21 | diff --git a/plugins/Makefile.am b/plugins/Makefile.am |
| 22 | index 64492e0..bcd0c10 100644 |
| 23 | --- a/plugins/Makefile.am |
| 24 | +++ b/plugins/Makefile.am |
| 25 | @@ -69,40 +69,18 @@ libsflowPlugin_la_CFLAGS = $(AM_CFLAGS) |
| 26 | # by default ntop looks for plugins in the plugins/ subdirectory |
| 27 | # |
| 28 | |
| 29 | - |
| 30 | -.libs/libnetflowPlugin.so@SO_VERSION_PATCH@: |
| 31 | - @if test -f libnetflowPlugin_la-netflowPlugin.o; then \ |
| 32 | - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ libnetflowPlugin_la-netflowPlugin.o; \ |
| 33 | - else \ |
| 34 | - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ netflowPlugin.o; \ |
| 35 | - fi |
| 36 | - |
| 37 | -netflowPlugin.so$(EXEEXT): .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ |
| 38 | - @$(LN_S) .libs/libnetflowPlugin.so netflowPlugin.so |
| 39 | +netflowPlugin.so$(EXEEXT): libnetflowPlugin.la |
| 40 | + @$(LN_S) -f .libs/libnetflowPlugin.so netflowPlugin.so |
| 41 | |
| 42 | ############### |
| 43 | |
| 44 | -.libs/librrdPlugin.so@SO_VERSION_PATCH@: |
| 45 | - @if test -f librrdPlugin_la-rrdPlugin.o; then \ |
| 46 | - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ librrdPlugin_la-rrdPlugin.o; \ |
| 47 | - else \ |
| 48 | - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ rrdPlugin.o; \ |
| 49 | - fi |
| 50 | - |
| 51 | -rrdPlugin.so$(EXEEXT): .libs/librrdPlugin.so@SO_VERSION_PATCH@ |
| 52 | - @$(LN_S) .libs/librrdPlugin.so rrdPlugin.so |
| 53 | +rrdPlugin.so$(EXEEXT): librrdPlugin.la |
| 54 | + @$(LN_S) -f .libs/librrdPlugin.so rrdPlugin.so |
| 55 | |
| 56 | ############### |
| 57 | |
| 58 | -.libs/libsflowPlugin.so@SO_VERSION_PATCH@: |
| 59 | - @if test -f libsflowPlugin_la-sflowPlugin.o; then \ |
| 60 | - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ libsflowPlugin_la-sflowPlugin.o; \ |
| 61 | - else \ |
| 62 | - $(CC) @MAKE_SHARED_LIBRARY_PARM@ -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ sflowPlugin.o; \ |
| 63 | - fi |
| 64 | - |
| 65 | -sflowPlugin.so$(EXEEXT): .libs/libsflowPlugin.so@SO_VERSION_PATCH@ |
| 66 | - @$(LN_S) .libs/libsflowPlugin.so sflowPlugin.so |
| 67 | +sflowPlugin.so$(EXEEXT): libsflowPlugin.la |
| 68 | + @$(LN_S) -f .libs/libsflowPlugin.so sflowPlugin.so |
| 69 | |
| 70 | ############### |
| 71 | |
| 72 | -- |
| 73 | 2.7.4 |
| 74 | |