- all compiling ok, but it's something wrong with Plugins Makefile,

- saved work,

Changed files:
    ntop-Makefile.patch -> 1.2
    ntop-pep-Makefile.patch -> 1.2
    ntop-plugins-Makefile.patch -> 1.3

diff --git a/ntop-Makefile.patch b/ntop-Makefile.patch
index d802ed70d2e6b9dddcd984d8b8a2e3342056beac..5186bc6d55b1924a06ded939708317efdc8b04b3 100644 (file)
--- a/ntop-Makefile.patch
+++ b/ntop-Makefile.patch
@@ -1,29 +1,18 @@
---- Makefile.am.orig   Tue Mar 26 09:48:59 2002
-+++ Makefile.am        Tue Mar 26 09:50:10 2002
-@@ -128,7 +128,7 @@
+--- Makefile.am.orig   Sat Mar 30 00:05:08 2002
++++ Makefile.am        Thu Apr  4 12:44:48 2002
+@@ -128,7 +128,6 @@
  
  libntop_la_DEPENDENCIES = config.h
  libntop_la_LIBADD       = $(CORELIBS)
 -libntop_la_LDFLAGS      = -version-info @NTOP_VERSION_INFO@ -release @NTOP_RELEASE@ -export-dynamic @DYN_FLAGS@
-+libntop_la_LDFLAGS      = -release @NTOP_RELEASE@ -export-dynamic @DYN_FLAGS@
  
  # Archive for http representation, or the 'viewer'
  libntopreport_la_SOURCES = admin.c emitter.c \
-@@ -142,7 +142,7 @@
+@@ -142,7 +141,6 @@
  
  libntopreport_la_DEPENDENCIES = config.h
  libntopreport_la_LIBADD       = $(MORELIBS)
 -libntopreport_la_LDFLAGS      = -version-info @NTOP_VERSION_INFO@ -release @NTOP_RELEASE@ -export-dynamic @DYN_FLAGS@
-+libntopreport_la_LDFLAGS      = -release @NTOP_RELEASE@ -export-dynamic @DYN_FLAGS@
  
- man_MANS = ntop.8 intop/intop.1
+ man_MANS = ntop.8
  
-@@ -218,7 +218,7 @@
-       /bin/rm -f privkey.pem cert.pem
- 
- install-data-local:
--      @cp -p ntop-cert.pem $(bindir)/ntop-cert.pem
-+      @cp -p ntop-cert.pem $(DESTDIR)/$(bindir)/ntop-cert.pem
-       @$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)/plugins;
-       @$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/ntop;
-       @$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/ntop/html;

diff --git a/ntop-pep-Makefile.patch b/ntop-pep-Makefile.patch
index 1204158771cd14d5877f7b275d109015a358fea0..ff5c11e441598aa152f85f933a15d3a22f84576f 100644 (file)
--- a/ntop-pep-Makefile.patch
+++ b/ntop-pep-Makefile.patch
@@ -1,11 +1,19 @@
---- Makefile.am.orig   Thu Jan  3 00:07:21 2002
-+++ Makefile.am        Mon Mar 25 22:31:56 2002
-@@ -39,7 +39,7 @@
+--- Makefile.am.orig   Thu Apr  4 12:50:44 2002
++++ Makefile.am        Thu Apr  4 12:54:05 2002
+@@ -44,7 +44,6 @@
+ plugin_LTLIBRARIES = libpep.la
+ 
+ libpep_la_SOURCES = pep.c
+-libpep_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@
+ 
  #
- # The meat for ntop
+ # LIBS must be cleared, or else libtool won't create a shared module.
+@@ -53,7 +52,6 @@
  #
--noinst_PROGRAMS = pep.so
-+#noinst_PROGRAMS = pep.so
- 
- plugin_LTLIBRARIES = libpep.la
+ LIBS = # ${PEPLIBS}
  
+-pep.so: pep.c
++pep: pep.c
+ #     ${CC} -shared ${libpep_la_OBJECTS} ${PEPLIBS} -Wl,-soname -Wl,libpep.so.0 -o pep.so
+       @${CC} -shared ${libpep_la_OBJECTS} ${PEPLIBS} -o pep.so
+-      (cd .. && ln -fs pep/pep.so .)

diff --git a/ntop-plugins-Makefile.patch b/ntop-plugins-Makefile.patch
index 06839b6b9d773c1410340726f82e0c8c42036b95..e9fe81eff8f7007c643ad0acc1047b6a54b9f293 100644 (file)
--- a/ntop-plugins-Makefile.patch
+++ b/ntop-plugins-Makefile.patch
@@ -1,59 +1,123 @@
---- Makefile.am        Tue Mar 26 01:26:33 2002
-+++ Makefile.am.new    Tue Mar 26 01:28:27 2002
-@@ -51,22 +51,22 @@
+--- Makefile.am.orig   Thu Apr  4 12:46:12 2002
++++ Makefile.am        Thu Apr  4 13:24:41 2002
+@@ -57,31 +57,31 @@
  #               librmonPlugin.la libwapPlugin.la
  
  libicmpPlugin_la_SOURCES = icmpPlugin.c
 -libicmpPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
-+libicmpPlugin_la_LDFLAGS = -shared @DYN_FLAGS@
++libicmpPlugin_la_LDFLAGS = -shared
+ 
+ #librrdPlugin_la_SOURCES = rrdPlugin.c
+-#librrdPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
++#librrdPlugin_la_LDFLAGS = -shared
+ 
+ libpdaPlugin_la_SOURCES = pdaPlugin.c
+-libpdaPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
++libpdaPlugin_la_LDFLAGS = -shared
  
  libsflowPlugin_la_SOURCES = sflowPlugin.c
 -libsflowPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
-+libsflowPlugin_la_LDFLAGS = -shared @DYN_FLAGS@
++libsflowPlugin_la_LDFLAGS = -shared
  
  liblastSeenPlugin_la_SOURCES = lastSeenPlugin.c
 -liblastSeenPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
-+liblastSeenPlugin_la_LDFLAGS = -shared @DYN_FLAGS@
++liblastSeenPlugin_la_LDFLAGS = -shared
+ 
+ libnetflowPlugin_la_SOURCES = netflowPlugin.c
+-libnetflowPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
++libnetflowPlugin_la_LDFLAGS = -shared
  
  libnfsPlugin_la_SOURCES = nfsPlugin.c
 -libnfsPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
-+libnfsPlugin_la_LDFLAGS = -shared @DYN_FLAGS@
++libnfsPlugin_la_LDFLAGS = -shared
  
  #librmonPlugin_la_SOURCES = rmonPlugin.c rmon.h
 -#librmonPlugin_la_LDFLAGS = @SNMPLIBS@ -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
-+#librmonPlugin_la_LDFLAGS = @SNMPLIBS@ -shared @DYN_FLAGS@
++#librmonPlugin_la_LDFLAGS = @SNMPLIBS@ -shared
  
  #libwapPlugin_la_SOURCES = wapPlugin.c
 -#libwapPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
-+#libwapPlugin_la_LDFLAGS = -shared @DYN_FLAGS@
++#libwapPlugin_la_LDFLAGS = -shared
  
  
  #
-@@ -78,27 +78,17 @@
- .libs/libicmpPlugin.so@SO_VERSION_PATCH@:
-       cc -bundle -flat_namespace -undefined suppress -o .libs/libicmpPlugin.so@SO_VERSION_PATCH@ icmpPlugin.o
+@@ -90,58 +90,40 @@
+ #
+ 
+ 
+-.libs/libicmpPlugin.so@SO_VERSION_PATCH@:
+-      cc -bundle -flat_namespace -undefined suppress -o .libs/libicmpPlugin.so@SO_VERSION_PATCH@ icmpPlugin.o
++.libs/libicmpPlugin.so:
++      cc -bundle -flat_namespace -undefined suppress -o .libs/libicmpPlugin.so icmpPlugin.o
  
 -icmpPlugin.so: .libs/libicmpPlugin.so@SO_VERSION_PATCH@
 -      @ln -s .libs/libicmpPlugin.so icmpPlugin.so
++#.libs/librrdPlugin.so:
++#     cc -bundle -flat_namespace -undefined suppress -o .libs/librrdPlugin.so rrdPlugin.o
  
- .libs/libsflowPlugin.so@SO_VERSION_PATCH@:
-       cc -bundle -flat_namespace -undefined suppress -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ sflowPlugin.o
+-#.libs/librrdPlugin.so@SO_VERSION_PATCH@:
+-#     cc -bundle -flat_namespace -undefined suppress -o .libs/librrdPlugin.so@SO_VERSION_PATCH@ rrdPlugin.o
+-
+-#rrdPlugin.so: .libs/librrdPlugin.so@SO_VERSION_PATCH@
++#rrdPlugin.so: .libs/librrdPlugin.so
+ #     @ln -s .libs/librrdPlugin.so rrdPlugin.so
  
+-.libs/libpdaPlugin.so@SO_VERSION_PATCH@:
+-      cc -bundle -flat_namespace -undefined suppress -o .libs/libpdaPlugin.so@SO_VERSION_PATCH@ pdaPlugin.o
+-
+-pdaPlugin.so: .libs/libpdaPlugin.so@SO_VERSION_PATCH@
+-      @ln -s .libs/libpdaPlugin.so pdaPlugin.so
+-
+-.libs/libsflowPlugin.so@SO_VERSION_PATCH@:
+-      cc -bundle -flat_namespace -undefined suppress -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ sflowPlugin.o
+-
 -sflowPlugin.so: .libs/libsflowPlugin.so@SO_VERSION_PATCH@
 -      @ln -s .libs/libsflowPlugin.so sflowPlugin.so
- 
- .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@:
-       cc -bundle -flat_namespace -undefined suppress -o .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@ lastSeenPlugin.o
- 
+-
+-.libs/liblastSeenPlugin.so@SO_VERSION_PATCH@:
+-      cc -bundle -flat_namespace -undefined suppress -o .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@ lastSeenPlugin.o
+-
 -lastSeenPlugin.so: .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@
 -      @ln -s .libs/liblastSeenPlugin.so lastSeenPlugin.so
--
- .libs/libnfsPlugin.so@SO_VERSION_PATCH@:
-       cc -bundle -flat_namespace -undefined suppress -o .libs/libnfsPlugin.so@SO_VERSION_PATCH@ nfsPlugin.o
++.libs/libpdaPlugin.so:
++      cc -bundle -flat_namespace -undefined suppress -o .libs/libpdaPlugin.so pdaPlugin.o
+ 
+-.libs/libnfsPlugin.so@SO_VERSION_PATCH@:
+-      cc -bundle -flat_namespace -undefined suppress -o .libs/libnfsPlugin.so@SO_VERSION_PATCH@ nfsPlugin.o
++.libs/libsflowPlugin.so:
++      cc -bundle -flat_namespace -undefined suppress -o .libs/libsflowPlugin.so sflowPlugin.o
+ 
+-netflowPlugin.so: .libs/libnetflowPlugin.so@SO_VERSION_PATCH@
+-      @ln -s .libs/libnetflowPlugin.so netflowPlugin.so
++.libs/liblastSeenPlugin.so:
++      cc -bundle -flat_namespace -undefined suppress -o .libs/liblastSeenPlugin.so lastSeenPlugin.o
+ 
+-.libs/libnetflowPlugin.so@SO_VERSION_PATCH@:
+-      cc -bundle -flat_namespace -undefined suppress -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ netflowPlugin.o
++.libs/libnfsPlugin.so:
++      cc -bundle -flat_namespace -undefined suppress -o .libs/libnfsPlugin.so nfsPlugin.o
  
 -nfsPlugin.so: .libs/libnfsPlugin.so@SO_VERSION_PATCH@
 -      @ln -s .libs/libnfsPlugin.so nfsPlugin.so
--
- #.libs/librmonPlugin.so@SO_VERSION_PATCH@:
- #     cc -bundle -flat_namespace -undefined suppress -o .libs/librmonPlugin.so@SO_VERSION_PATCH@ rmonPlugin.o
++.libs/libnetflowPlugin.so:
++      cc -bundle -flat_namespace -undefined suppress -o .libs/libnetflowPlugin.so netflowPlugin.o
+ 
+-#.libs/librmonPlugin.so@SO_VERSION_PATCH@:
+-#     cc -bundle -flat_namespace -undefined suppress -o .libs/librmonPlugin.so@SO_VERSION_PATCH@ rmonPlugin.o
++#.libs/librmonPlugin.so:
++#     cc -bundle -flat_namespace -undefined suppress -o .libs/librmonPlugin.so rmonPlugin.o
+ 
+-#rmonPlugin.so: .libs/librmonPlugin.so@SO_VERSION_PATCH@
++#rmonPlugin.so: .libs/librmonPlugin.so
+ #     @ln -s .libs/librmonPlugin.so rmonPlugin.so
+ 
+-#.libs/libwapPlugin.so@SO_VERSION_PATCH@:
+-#     cc -bundle -flat_namespace -undefined suppress -o .libs/libwapPlugin.so@SO_VERSION_PATCH@ wapPlugin.o
++#.libs/libwapPlugin.so:
++#     cc -bundle -flat_namespace -undefined suppress -o .libs/libwapPlugin.so wapPlugin.o
+ 
+-#wapPlugin.so: .libs/libwapPlugin.so@SO_VERSION_PATCH@
++#wapPlugin.so: .libs/libwapPlugin.so
+ #     @ln -s .libs/libwapPlugin.so wapPlugin.so
  
+ install-data-local: