forked from pool/osmo-ggsn
Jan Engelhardt
2f32687a40
OBS-URL: https://build.opensuse.org/package/show/network:telephony/osmo-ggsn?expand=0&rev=1
126 lines
4.6 KiB
Diff
126 lines
4.6 KiB
Diff
|
|
* stuff is in the wrong directory, move to sbin
|
|
* CFLAGS is abused for preprocessor, move to CPPFLAGS
|
|
* add missing $(LIBGTPNL_CFLAGS)
|
|
* ggsn includes libmnl.h but fails to PKG_CHECK for it;
|
|
turns out it only uses the header and no defs, so kill that.
|
|
* _DEPENDENCIES on files not generated by $this Makefile are pointless
|
|
* must use .la files in _LDADD/_LIBADD whenever they exist
|
|
* remove AC_PROG_CXX, the C++ is never used
|
|
|
|
---
|
|
ggsn/Makefile.am | 12 ++++++------
|
|
ggsn/gtp-kernel.c | 5 +----
|
|
gtp/Makefile.am | 3 ++-
|
|
lib/Makefile.am | 8 +++++---
|
|
sgsnemu/Makefile.am | 9 ++++-----
|
|
5 files changed, 18 insertions(+), 19 deletions(-)
|
|
|
|
Index: osmo-ggsn-1.0.0.30/ggsn/Makefile.am
|
|
===================================================================
|
|
--- osmo-ggsn-1.0.0.30.orig/ggsn/Makefile.am
|
|
+++ osmo-ggsn-1.0.0.30/ggsn/Makefile.am
|
|
@@ -1,17 +1,17 @@
|
|
-bin_PROGRAMS = osmo-ggsn
|
|
+sbin_PROGRAMS = osmo-ggsn
|
|
|
|
AM_LDFLAGS = @EXEC_LDFLAGS@
|
|
|
|
-AM_CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
|
|
+AM_CPPFLAGS = -D_GNU_SOURCE -DSBINDIR='"${sbindir}"' ${LIBOSMOCORE_CFLAGS} ${LIBOSMOCTRL_CFLAGS} ${LIBOSMOVTY_CFLAGS}
|
|
+AM_CFLAGS = -fno-builtin -Wall
|
|
|
|
-osmo_ggsn_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS)
|
|
+osmo_ggsn_LDADD = @EXEC_LDADD@ ../gtp/libgtp.la ../lib/libmisc.la $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS)
|
|
|
|
if ENABLE_GTP_KERNEL
|
|
-AM_CFLAGS += -DGTP_KERNEL
|
|
-osmo_ggsn_LDADD += -lgtpnl
|
|
+AM_CPPFLAGS += -DGTP_KERNEL ${LIBGTPNL_CFLAGS}
|
|
+osmo_ggsn_LDADD += ${LIBGTPNL_LIBS}
|
|
endif
|
|
|
|
-osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a
|
|
osmo_ggsn_SOURCES = ggsn_vty.c ggsn.c ggsn.h gtp-kernel.h icmpv6.c icmpv6.h checksum.c checksum.h
|
|
|
|
if ENABLE_GTP_KERNEL
|
|
Index: osmo-ggsn-1.0.0.30/ggsn/gtp-kernel.c
|
|
===================================================================
|
|
--- osmo-ggsn-1.0.0.30.orig/ggsn/gtp-kernel.c
|
|
+++ osmo-ggsn-1.0.0.30/ggsn/gtp-kernel.c
|
|
@@ -17,8 +17,6 @@
|
|
|
|
#include <libgtpnl/gtp.h>
|
|
#include <libgtpnl/gtpnl.h>
|
|
-#include <libmnl/libmnl.h>
|
|
-
|
|
#include <errno.h>
|
|
|
|
#include <time.h>
|
|
@@ -30,8 +28,6 @@
|
|
|
|
#include <libgtpnl/gtp.h>
|
|
#include <libgtpnl/gtpnl.h>
|
|
-#include <libmnl/libmnl.h>
|
|
-
|
|
#include "gtp-kernel.h"
|
|
|
|
static void pdp_debug(struct pdp_t *pdp)
|
|
@@ -69,6 +65,7 @@ static void pdp_debug(struct pdp_t *pdp)
|
|
printf("\n");
|
|
}
|
|
|
|
+struct mnl_socket;
|
|
static struct {
|
|
int genl_id;
|
|
struct mnl_socket *nl;
|
|
Index: osmo-ggsn-1.0.0.30/gtp/Makefile.am
|
|
===================================================================
|
|
--- osmo-ggsn-1.0.0.30.orig/gtp/Makefile.am
|
|
+++ osmo-ggsn-1.0.0.30/gtp/Makefile.am
|
|
@@ -6,7 +6,8 @@ lib_LTLIBRARIES = libgtp.la
|
|
|
|
include_HEADERS = gtp.h pdp.h gtpie.h
|
|
|
|
-AM_CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS)
|
|
+AM_CPPFLAGS = -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS)
|
|
+AM_CFLAGS = -O2 -fno-builtin -Wall -ggdb
|
|
|
|
libgtp_la_SOURCES = gtp.c gtp.h gtpie.c gtpie.h pdp.c pdp.h lookupa.c lookupa.h queue.c queue.h
|
|
libgtp_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
|
|
Index: osmo-ggsn-1.0.0.30/lib/Makefile.am
|
|
===================================================================
|
|
--- osmo-ggsn-1.0.0.30.orig/lib/Makefile.am
|
|
+++ osmo-ggsn-1.0.0.30/lib/Makefile.am
|
|
@@ -1,7 +1,9 @@
|
|
-noinst_LIBRARIES = libmisc.a
|
|
+noinst_LTLIBRARIES = libmisc.la
|
|
|
|
noinst_HEADERS = gnugetopt.h ippool.h lookup.h syserr.h tun.h in46_addr.h
|
|
|
|
-AM_CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS)
|
|
+AM_CPPFLAGS = -DSBINDIR='"${sbindir}"' ${LIBOSMOCORE_CFLAGS}
|
|
+AM_CFLAGS = -fno-builtin -Wall
|
|
|
|
-libmisc_a_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c
|
|
+libmisc_la_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c
|
|
+libmisc_la_LIBADD = ${LIBOSMOCORE_LIBS}
|
|
Index: osmo-ggsn-1.0.0.30/sgsnemu/Makefile.am
|
|
===================================================================
|
|
--- osmo-ggsn-1.0.0.30.orig/sgsnemu/Makefile.am
|
|
+++ osmo-ggsn-1.0.0.30/sgsnemu/Makefile.am
|
|
@@ -1,9 +1,8 @@
|
|
-bin_PROGRAMS = sgsnemu
|
|
+sbin_PROGRAMS = sgsnemu
|
|
|
|
AM_LDFLAGS = @EXEC_LDFLAGS@
|
|
+AM_CPPFLAGS = -D_GNU_SOURCE -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS)
|
|
+AM_CFLAGS = -O2 -fno-builtin -Wall -ggdb
|
|
|
|
-AM_CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS)
|
|
-
|
|
-sgsnemu_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS)
|
|
-sgsnemu_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a
|
|
+sgsnemu_LDADD = @EXEC_LDADD@ ../gtp/libgtp.la ../lib/libmisc.la $(LIBOSMOCORE_LIBS)
|
|
sgsnemu_SOURCES = sgsnemu.c cmdline.c cmdline.h
|