--- ntop-current/Makefile.am	Tue Jan  8 17:05:04 2002
+++ 2.0-released/Makefile.am	Fri Dec 28 08:57:06 2001
@@ -57,5 +57,6 @@
 SUBDIRS = . @PLUGINS@ @INTOP@
 
-DIST_COMMON = AUTHORS CONTENTS COPYING ChangeLog \
+DIST_COMMON = 
+DIST_COMMON += AUTHORS CONTENTS COPYING ChangeLog \
               MANIFESTO NEWS PORTING  \
               SUPPORT_NTOP.txt THANKS \
@@ -130,5 +131,5 @@
 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      = -version-info 0 -release 2 -export-dynamic @DYN_FLAGS@
 
 # Archive for http representation, or the 'viewer'
@@ -144,5 +145,5 @@
 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      = -version-info 0 -release 2 -export-dynamic @DYN_FLAGS@
 
 man_MANS = ntop.8 intop/intop.1
--- ntop-current/plugins/pep/Makefile.am	Wed Jan  2 17:07:21 2002
+++ 2.0-released/plugins/pep/Makefile.am	Fri Dec 28 08:57:06 2001
@@ -24,5 +24,6 @@
 #
 
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON =
+DIST_COMMON += Makefile.am Makefile.in
 CLEANFILES  =
 EXTRA_DIST  = available.pl hosts.pl
@@ -54,6 +55,6 @@
 LIBS = # ${PEPLIBS}
 
-pep.so: pep.c
+pep.so($EXEEXT): 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 .)
\ No newline at end of file
+	(cd .. && ln -fs pep/pep.so .)
--- ntop-current/intop/Makefile.am	Wed Jan  2 17:07:05 2002
+++ 2.0-released/intop/Makefile.am	Fri Dec 28 08:57:06 2001
@@ -25,5 +25,6 @@
 #
 
-DIST_COMMON = Makefile.am Makefile.in intop.1
+DIST_COMMON =
+DIST_COMMON += Makefile.am Makefile.in intop.1
 
 DISTCLEANFILES = logger.db ntop.db ntop_pw.db intops
--- ntop-current-original/plugins/Makefile.am	Tue Mar 26 17:05:10 2002
+++ ntop-current/plugins/Makefile.am	Fri Mar 29 18:09:18 2002
@@ -27,5 +27,6 @@
 SUBDIRS = . #pep
 
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON =
+DIST_COMMON += Makefile.am Makefile.in
 CLEANFILES  =
 EXTRA_DIST  =
@@ -56,26 +57,26 @@
 
 libicmpPlugin_la_SOURCES = icmpPlugin.c
-libicmpPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
+libicmpPlugin_la_LDFLAGS = -shared -version-info 2 @DYN_FLAGS@
 
 #librrdPlugin_la_SOURCES = rrdPlugin.c
-#librrdPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
+#librrdPlugin_la_LDFLAGS = -shared -version-info 2 @DYN_FLAGS@
 
 libsflowPlugin_la_SOURCES = sflowPlugin.c
-libsflowPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
+libsflowPlugin_la_LDFLAGS = -shared -version-info 2 @DYN_FLAGS@
 
 liblastSeenPlugin_la_SOURCES = lastSeenPlugin.c
-liblastSeenPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
+liblastSeenPlugin_la_LDFLAGS = -shared -version-info 2 @DYN_FLAGS@
 
 libnetflowPlugin_la_SOURCES = netflowPlugin.c
-libnetflowPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
+libnetflowPlugin_la_LDFLAGS = -shared -version-info 2 @DYN_FLAGS@
 
 libnfsPlugin_la_SOURCES = nfsPlugin.c
-libnfsPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
+libnfsPlugin_la_LDFLAGS = -shared -version-info 2 @DYN_FLAGS@
 
 #librmonPlugin_la_SOURCES = rmonPlugin.c rmon.h
-#librmonPlugin_la_LDFLAGS = @SNMPLIBS@ -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
+#librmonPlugin_la_LDFLAGS = @SNMPLIBS@ -shared -version-info 2 @DYN_FLAGS@
 
 #libwapPlugin_la_SOURCES = wapPlugin.c
-#libwapPlugin_la_LDFLAGS = -shared -version-info @NTOP_VERSION_INFO@ @DYN_FLAGS@
+#libwapPlugin_la_LDFLAGS = -shared -version-info 2 @DYN_FLAGS@
 
 
@@ -89,5 +90,5 @@
 	cc -bundle -flat_namespace -undefined suppress -o .libs/libicmpPlugin.so@SO_VERSION_PATCH@ icmpPlugin.o
 
-icmpPlugin.so: .libs/libicmpPlugin.so@SO_VERSION_PATCH@
+icmpPlugin.so$(EXEEXT): .libs/libicmpPlugin.so@SO_VERSION_PATCH@
 	@ln -s .libs/libicmpPlugin.so icmpPlugin.so
 
@@ -101,5 +102,5 @@
 	cc -bundle -flat_namespace -undefined suppress -o .libs/libsflowPlugin.so@SO_VERSION_PATCH@ sflowPlugin.o
 
-sflowPlugin.so: .libs/libsflowPlugin.so@SO_VERSION_PATCH@
+sflowPlugin.so$(EXEEXT): .libs/libsflowPlugin.so@SO_VERSION_PATCH@
 	@ln -s .libs/libsflowPlugin.so sflowPlugin.so
 
@@ -107,5 +108,5 @@
 	cc -bundle -flat_namespace -undefined suppress -o .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@ lastSeenPlugin.o
 
-lastSeenPlugin.so: .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@
+lastSeenPlugin.so$(EXEEXT): .libs/liblastSeenPlugin.so@SO_VERSION_PATCH@
 	@ln -s .libs/liblastSeenPlugin.so lastSeenPlugin.so
 
@@ -119,5 +120,5 @@
 	cc -bundle -flat_namespace -undefined suppress -o .libs/libnetflowPlugin.so@SO_VERSION_PATCH@ netflowPlugin.o
 
-nfsPlugin.so: .libs/libnfsPlugin.so@SO_VERSION_PATCH@
+nfsPlugin.so$(EXEEXT): .libs/libnfsPlugin.so@SO_VERSION_PATCH@
 	@ln -s .libs/libnfsPlugin.so nfsPlugin.so
 
@@ -125,5 +126,5 @@
 #	cc -bundle -flat_namespace -undefined suppress -o .libs/librmonPlugin.so@SO_VERSION_PATCH@ rmonPlugin.o
 
-#rmonPlugin.so: .libs/librmonPlugin.so@SO_VERSION_PATCH@
+#rmonPlugin.so$(EXEEXT): .libs/librmonPlugin.so@SO_VERSION_PATCH@
 #	@ln -s .libs/librmonPlugin.so rmonPlugin.so
 
@@ -131,5 +132,5 @@
 #	cc -bundle -flat_namespace -undefined suppress -o .libs/libwapPlugin.so@SO_VERSION_PATCH@ wapPlugin.o
 
-#wapPlugin.so: .libs/libwapPlugin.so@SO_VERSION_PATCH@
+#wapPlugin.so$(EXEEXT): .libs/libwapPlugin.so@SO_VERSION_PATCH@
 #	@ln -s .libs/libwapPlugin.so wapPlugin.so