You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
357 lines
14 KiB
357 lines
14 KiB
Index: plugins/BPF-Filter/Makefile.in |
|
--- plugins/BPF-Filter/Makefile.in.orig 2006-01-15 00:46:59 +0100 |
|
+++ plugins/BPF-Filter/Makefile.in 2006-03-10 13:00:23 +0100 |
|
@@ -79,7 +79,7 @@ |
|
ETAGS = etags |
|
CTAGS = ctags |
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
|
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins/ |
|
+pkgincludedir = $(includedir)/libnetdude/plugins/ |
|
ACLOCAL = @ACLOCAL@ |
|
AMDEP_FALSE = @AMDEP_FALSE@ |
|
AMDEP_TRUE = @AMDEP_TRUE@ |
|
@@ -210,7 +210,7 @@ |
|
# A list of all the files in the current directory which can be regenerated |
|
MAINTAINERCLEANFILES = Makefile.in |
|
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall |
|
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/plugins |
|
+pkgdir = $(pkgdatadir)/plugins |
|
pkg_LTLIBRARIES = libnd_bpf.la |
|
pkginclude_HEADERS = libnd_bpf.h |
|
libnd_bpf_la_SOURCES = libnd_bpf.c |
|
Index: plugins/ChecksumFix/Makefile.in |
|
--- plugins/ChecksumFix/Makefile.in.orig 2006-01-15 00:47:01 +0100 |
|
+++ plugins/ChecksumFix/Makefile.in 2006-03-10 13:00:23 +0100 |
|
@@ -79,7 +79,7 @@ |
|
ETAGS = etags |
|
CTAGS = ctags |
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
|
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins/ |
|
+pkgincludedir = $(includedir)/libnetdude/plugins/ |
|
ACLOCAL = @ACLOCAL@ |
|
AMDEP_FALSE = @AMDEP_FALSE@ |
|
AMDEP_TRUE = @AMDEP_TRUE@ |
|
@@ -210,7 +210,7 @@ |
|
# A list of all the files in the current directory which can be regenerated |
|
MAINTAINERCLEANFILES = Makefile.in |
|
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall |
|
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/plugins |
|
+pkgdir = $(pkgdatadir)/plugins |
|
pkg_LTLIBRARIES = libnd_cksumfix.la |
|
pkginclude_HEADERS = libnd_cksumfix.h |
|
libnd_cksumfix_la_SOURCES = libnd_cksumfix.c |
|
Index: protocols/802.11/Makefile.in |
|
--- protocols/802.11/Makefile.in.orig 2006-01-15 00:47:04 +0100 |
|
+++ protocols/802.11/Makefile.in 2006-03-10 13:03:15 +0100 |
|
@@ -205,7 +205,7 @@ |
|
# A list of all the files in the current directory which can be regenerated |
|
MAINTAINERCLEANFILES = Makefile.in |
|
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall |
|
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols |
|
+pkgdir = $(pkgdatadir)/protocols |
|
pkg_LTLIBRARIES = libnd_802_11.la |
|
libnd_802_11_la_SOURCES = libnd_802_11.c libnd_802_11.h |
|
libnd_802_11_la_LDFLAGS = -module -avoid-version |
|
Index: protocols/arp/Makefile.in |
|
--- protocols/arp/Makefile.in.orig 2006-01-15 00:47:07 +0100 |
|
+++ protocols/arp/Makefile.in 2006-03-10 13:00:23 +0100 |
|
@@ -75,7 +75,7 @@ |
|
ETAGS = etags |
|
CTAGS = ctags |
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
|
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/arp |
|
+pkgincludedir = $(includedir)/libnetdude/protocols/arp |
|
ACLOCAL = @ACLOCAL@ |
|
AMDEP_FALSE = @AMDEP_FALSE@ |
|
AMDEP_TRUE = @AMDEP_TRUE@ |
|
@@ -205,7 +205,7 @@ |
|
# A list of all the files in the current directory which can be regenerated |
|
MAINTAINERCLEANFILES = Makefile.in |
|
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall |
|
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols |
|
+pkgdir = $(pkgdatadir)/protocols |
|
pkg_LTLIBRARIES = libnd_arp.la |
|
libnd_arp_la_SOURCES = libnd_arp.c libnd_arp.h |
|
libnd_arp_la_LDFLAGS = -module -avoid-version |
|
Index: protocols/ether/Makefile.in |
|
--- protocols/ether/Makefile.in.orig 2006-01-15 00:47:09 +0100 |
|
+++ protocols/ether/Makefile.in 2006-03-10 13:00:23 +0100 |
|
@@ -205,7 +205,7 @@ |
|
# A list of all the files in the current directory which can be regenerated |
|
MAINTAINERCLEANFILES = Makefile.in |
|
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall |
|
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols |
|
+pkgdir = $(pkgdatadir)/protocols |
|
pkg_LTLIBRARIES = libnd_ethernet.la |
|
libnd_ethernet_la_SOURCES = libnd_ether.c libnd_ether.h |
|
libnd_ethernet_la_LDFLAGS = -module -avoid-version |
|
Index: protocols/fddi/Makefile.in |
|
--- protocols/fddi/Makefile.in.orig 2006-01-15 00:47:11 +0100 |
|
+++ protocols/fddi/Makefile.in 2006-03-10 13:00:23 +0100 |
|
@@ -79,7 +79,7 @@ |
|
ETAGS = etags |
|
CTAGS = ctags |
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
|
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/fddi |
|
+pkgincludedir = $(includedir)/libnetdude/protocols/fddi |
|
ACLOCAL = @ACLOCAL@ |
|
AMDEP_FALSE = @AMDEP_FALSE@ |
|
AMDEP_TRUE = @AMDEP_TRUE@ |
|
@@ -209,7 +209,7 @@ |
|
# A list of all the files in the current directory which can be regenerated |
|
MAINTAINERCLEANFILES = Makefile.in |
|
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall |
|
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols |
|
+pkgdir = $(pkgdatadir)/protocols |
|
pkg_LTLIBRARIES = libnd_fddi.la |
|
pkginclude_HEADERS = libnd_fddi.h |
|
libnd_fddi_la_SOURCES = libnd_fddi.c libnd_fddi.h |
|
Index: protocols/icmp/Makefile.in |
|
--- protocols/icmp/Makefile.in.orig 2006-01-15 00:47:13 +0100 |
|
+++ protocols/icmp/Makefile.in 2006-03-10 13:00:23 +0100 |
|
@@ -79,7 +79,7 @@ |
|
ETAGS = etags |
|
CTAGS = ctags |
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
|
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/icmp |
|
+pkgincludedir = $(includedir)/libnetdude/protocols/icmp |
|
ACLOCAL = @ACLOCAL@ |
|
AMDEP_FALSE = @AMDEP_FALSE@ |
|
AMDEP_TRUE = @AMDEP_TRUE@ |
|
@@ -209,7 +209,7 @@ |
|
# A list of all the files in the current directory which can be regenerated |
|
MAINTAINERCLEANFILES = Makefile.in |
|
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall |
|
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols |
|
+pkgdir = $(pkgdatadir)/protocols |
|
pkg_LTLIBRARIES = libnd_icmp.la |
|
pkginclude_HEADERS = libnd_icmp.h |
|
libnd_icmp_la_SOURCES = libnd_icmp.c libnd_icmp.h |
|
Index: protocols/ip/Makefile.in |
|
--- protocols/ip/Makefile.in.orig 2006-01-15 00:47:15 +0100 |
|
+++ protocols/ip/Makefile.in 2006-03-10 13:00:23 +0100 |
|
@@ -79,7 +79,7 @@ |
|
ETAGS = etags |
|
CTAGS = ctags |
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
|
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/ip |
|
+pkgincludedir = $(includedir)/libnetdude/protocols/ip |
|
ACLOCAL = @ACLOCAL@ |
|
AMDEP_FALSE = @AMDEP_FALSE@ |
|
AMDEP_TRUE = @AMDEP_TRUE@ |
|
@@ -209,7 +209,7 @@ |
|
# A list of all the files in the current directory which can be regenerated |
|
MAINTAINERCLEANFILES = Makefile.in |
|
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall |
|
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols |
|
+pkgdir = $(pkgdatadir)/protocols |
|
pkg_LTLIBRARIES = libnd_ip.la |
|
pkginclude_HEADERS = libnd_ip.h |
|
libnd_ip_la_SOURCES = libnd_ip.c libnd_ip.h |
|
Index: protocols/linux-sll/Makefile.in |
|
--- protocols/linux-sll/Makefile.in.orig 2006-01-15 00:47:17 +0100 |
|
+++ protocols/linux-sll/Makefile.in 2006-03-10 13:00:23 +0100 |
|
@@ -75,7 +75,7 @@ |
|
ETAGS = etags |
|
CTAGS = ctags |
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
|
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/sll |
|
+pkgincludedir = $(includedir)/libnetdude/protocols/sll |
|
ACLOCAL = @ACLOCAL@ |
|
AMDEP_FALSE = @AMDEP_FALSE@ |
|
AMDEP_TRUE = @AMDEP_TRUE@ |
|
@@ -205,7 +205,7 @@ |
|
# A list of all the files in the current directory which can be regenerated |
|
MAINTAINERCLEANFILES = Makefile.in |
|
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall |
|
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols |
|
+pkgdir = $(pkgdatadir)/protocols |
|
pkg_LTLIBRARIES = libnd_sll.la |
|
libnd_sll_la_SOURCES = libnd_sll.c libnd_sll.h |
|
libnd_sll_la_LDFLAGS = -module -avoid-version |
|
Index: protocols/snap/Makefile.in |
|
--- protocols/snap/Makefile.in.orig 2006-01-15 00:47:19 +0100 |
|
+++ protocols/snap/Makefile.in 2006-03-10 13:00:23 +0100 |
|
@@ -79,7 +79,7 @@ |
|
ETAGS = etags |
|
CTAGS = ctags |
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
|
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/snap |
|
+pkgincludedir = $(includedir)/libnetdude/protocols/snap |
|
ACLOCAL = @ACLOCAL@ |
|
AMDEP_FALSE = @AMDEP_FALSE@ |
|
AMDEP_TRUE = @AMDEP_TRUE@ |
|
@@ -209,7 +209,7 @@ |
|
# A list of all the files in the current directory which can be regenerated |
|
MAINTAINERCLEANFILES = Makefile.in |
|
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall |
|
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols |
|
+pkgdir = $(pkgdatadir)/protocols |
|
pkg_LTLIBRARIES = libnd_snap.la |
|
pkginclude_HEADERS = libnd_snap.h |
|
libnd_snap_la_SOURCES = libnd_snap.c libnd_snap.h |
|
Index: protocols/tcp/Makefile.in |
|
--- protocols/tcp/Makefile.in.orig 2006-01-15 00:47:21 +0100 |
|
+++ protocols/tcp/Makefile.in 2006-03-10 13:00:23 +0100 |
|
@@ -79,7 +79,7 @@ |
|
ETAGS = etags |
|
CTAGS = ctags |
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
|
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/tcp |
|
+pkgincludedir = $(includedir)/libnetdude/protocols/tcp |
|
ACLOCAL = @ACLOCAL@ |
|
AMDEP_FALSE = @AMDEP_FALSE@ |
|
AMDEP_TRUE = @AMDEP_TRUE@ |
|
@@ -209,7 +209,7 @@ |
|
# A list of all the files in the current directory which can be regenerated |
|
MAINTAINERCLEANFILES = Makefile.in |
|
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall |
|
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols |
|
+pkgdir = $(pkgdatadir)/protocols |
|
pkg_LTLIBRARIES = libnd_tcp.la |
|
pkginclude_HEADERS = libnd_tcp.h libnd_tcb.h |
|
libnd_tcp_la_SOURCES = \ |
|
Index: protocols/udp/Makefile.in |
|
--- protocols/udp/Makefile.in.orig 2006-01-15 00:47:23 +0100 |
|
+++ protocols/udp/Makefile.in 2006-03-10 13:00:23 +0100 |
|
@@ -79,7 +79,7 @@ |
|
ETAGS = etags |
|
CTAGS = ctags |
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
|
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/protocols/udp |
|
+pkgincludedir = $(includedir)/libnetdude/protocols/udp |
|
ACLOCAL = @ACLOCAL@ |
|
AMDEP_FALSE = @AMDEP_FALSE@ |
|
AMDEP_TRUE = @AMDEP_TRUE@ |
|
@@ -209,7 +209,7 @@ |
|
# A list of all the files in the current directory which can be regenerated |
|
MAINTAINERCLEANFILES = Makefile.in |
|
INCLUDES = @glib_cflags@ @pcapnav_cflags@ -I$(top_srcdir) -I$(top_srcdir)/libltdl -I$(top_srcdir)/src -W -Wall |
|
-pkgdir = $(pkgdatadir)/$(version_major).$(version_minor)/protocols |
|
+pkgdir = $(pkgdatadir)/protocols |
|
pkg_LTLIBRARIES = libnd_udp.la |
|
pkginclude_HEADERS = libnd_udp.h |
|
libnd_udp_la_SOURCES = libnd_udp.c libnd_udp.h |
|
Index: src/Makefile.in |
|
--- src/Makefile.in.orig 2006-01-15 00:47:27 +0100 |
|
+++ src/Makefile.in 2006-03-10 13:00:23 +0100 |
|
@@ -88,7 +88,7 @@ |
|
ETAGS = etags |
|
CTAGS = ctags |
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
|
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor) |
|
+pkgincludedir = $(includedir)/libnetdude |
|
ACLOCAL = @ACLOCAL@ |
|
AMDEP_FALSE = @AMDEP_FALSE@ |
|
AMDEP_TRUE = @AMDEP_TRUE@ |
|
Index: src/libnd_prefs.c |
|
--- src/libnd_prefs.c.orig 2006-01-15 00:44:05 +0100 |
|
+++ src/libnd_prefs.c 2006-03-10 13:00:23 +0100 |
|
@@ -130,8 +130,8 @@ |
|
if (dir[0] != 0) |
|
return dir; |
|
|
|
- g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/plugins", |
|
- PACKAGE_DATA_DIR, VERSION_MAJOR, VERSION_MINOR); |
|
+ g_snprintf(dir, MAXPATHLEN, "%s/plugins", |
|
+ PACKAGE_DATA_DIR); |
|
|
|
return dir; |
|
} |
|
@@ -145,8 +145,8 @@ |
|
if (dir[0] != 0) |
|
return dir; |
|
|
|
- g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/plugins", |
|
- libnd_prefs_get_netdude_dir(), VERSION_MAJOR, VERSION_MINOR); |
|
+ g_snprintf(dir, MAXPATHLEN, "%s/plugins", |
|
+ libnd_prefs_get_netdude_dir()); |
|
|
|
return dir; |
|
} |
|
@@ -160,8 +160,8 @@ |
|
if (dir[0] != 0) |
|
return dir; |
|
|
|
- g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/protocols", |
|
- PACKAGE_DATA_DIR, VERSION_MAJOR, VERSION_MINOR); |
|
+ g_snprintf(dir, MAXPATHLEN, "%s/protocols", |
|
+ PACKAGE_DATA_DIR); |
|
|
|
return dir; |
|
} |
|
@@ -175,8 +175,8 @@ |
|
if (dir[0] != 0) |
|
return dir; |
|
|
|
- g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/protocols", |
|
- libnd_prefs_get_netdude_dir(), VERSION_MAJOR, VERSION_MINOR); |
|
+ g_snprintf(dir, MAXPATHLEN, "%s/protocols", |
|
+ libnd_prefs_get_netdude_dir()); |
|
|
|
return dir; |
|
} |
|
@@ -515,8 +515,8 @@ |
|
return FALSE; |
|
} |
|
|
|
- g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/plugins", |
|
- libnd_prefs_get_netdude_dir(), VERSION_MAJOR, VERSION_MINOR); |
|
+ g_snprintf(dir, MAXPATHLEN, "%s/plugins", |
|
+ libnd_prefs_get_netdude_dir()); |
|
|
|
if (mkdir(dir, mode_755) < 0) |
|
{ |
|
@@ -524,8 +524,8 @@ |
|
return FALSE; |
|
} |
|
|
|
- g_snprintf(dir, MAXPATHLEN, "%s/%s.%s/protocols", |
|
- libnd_prefs_get_netdude_dir(), VERSION_MAJOR, VERSION_MINOR); |
|
+ g_snprintf(dir, MAXPATHLEN, "%s/protocols", |
|
+ libnd_prefs_get_netdude_dir()); |
|
|
|
if (mkdir(dir, mode_755) < 0) |
|
{ |
|
Index: tools/Makefile.in |
|
--- tools/Makefile.in.orig 2006-01-15 00:47:32 +0100 |
|
+++ tools/Makefile.in 2006-03-10 13:00:23 +0100 |
|
@@ -203,6 +203,7 @@ |
|
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/libltdl @glib_cflags@ @pcapnav_cflags@ -W -Wall ## -DMEMDEBUG |
|
lndtool_SOURCES = lndtool.c |
|
lndtool_LDADD = -L$(top_builddir)/src/ -lnetdude |
|
+lndtool_LDFLAGS = -static -export-dynamic -export-symbols-regex='.*' |
|
all: all-am |
|
|
|
.SUFFIXES: |
|
Index: tools/lndtool.c.in |
|
--- tools/lndtool.c.in.orig 2005-05-04 19:48:03 +0200 |
|
+++ tools/lndtool.c.in 2006-03-10 13:00:23 +0100 |
|
@@ -158,7 +158,7 @@ |
|
|
|
if (strcmp("@PACKAGE_INCLUDE_DIR@", "/usr/include")) |
|
includes = "-I@PACKAGE_INCLUDE_DIR@ "; |
|
- printf("%s-I@prefix@/include/libnetdude/@version_major@.@version_minor@ @glib_cflags@ @pcapnav_cflags@\n", |
|
+ printf("%s-I@prefix@/include/libnetdude @glib_cflags@ @pcapnav_cflags@\n", |
|
includes); |
|
} |
|
else if (! strcmp(argv[i], "--libs")) |
|
@@ -167,15 +167,15 @@ |
|
} |
|
else if (! strcmp(argv[i], "--include-dir")) |
|
{ |
|
- printf("@prefix@/include/libnetdude/@version_major@.@version_minor@\n"); |
|
+ printf("@prefix@/include/libnetdude\n"); |
|
} |
|
else if (! strcmp(argv[i], "--plugin-dir")) |
|
{ |
|
- printf("@PACKAGE_DATA_DIR@/@version_major@.@version_minor@/plugins\n"); |
|
+ printf("@PACKAGE_DATA_DIR@/plugins\n"); |
|
} |
|
else if (! strcmp(argv[i], "--proto-dir")) |
|
{ |
|
- printf("@PACKAGE_DATA_DIR@/@version_major@.@version_minor@/protocols\n"); |
|
+ printf("@PACKAGE_DATA_DIR@/protocols\n"); |
|
} |
|
else if (! strcmp(argv[i], "--plugins") || |
|
! strcmp(argv[i], "-p"))
|
|
|