Move common sgsnemu/ggsn files to directory "lib"

Some files like in sgsnemu and ggsn directory where exactly the same. They are now moved to the same directory for easier maintenance Signed-off-by: Emmanuel Bretelle <[email protected]>
chantra · Oct 20, 2010 · 2a10368 · 2a10368
1 parent 2a7cad5
commit 2a10368
Show file tree

Hide file tree

Showing 28 changed files with 18 additions and 3,232 deletions.
diff --git a/acinclude.m4 b/acinclude.m4
@@ -13,5 +13,5 @@ AC_DEFUN([adl_FUNC_GETOPT_LONG],
      [# use the GNU replacement
       AC_LIBOBJ(getopt)
       AC_LIBOBJ(getopt1)
-      AC_CONFIG_LINKS([ggsn/getopt.h:ggsn/gnugetopt.h])
-      AC_CONFIG_LINKS([sgsnemu/getopt.h:sgsnemu/gnugetopt.h])])])])
+      AC_CONFIG_LINKS([lib/getopt.h:lib/gnugetopt.h])])])])
+
diff --git a/configure.in b/configure.in
@@ -14,6 +14,8 @@ AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_RANLIB
 
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_LIBOBJ_DIR([lib])
 
 #JJAKO Check for libtool
 AC_PROG_LIBTOOL

diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am
@@ -1,5 +1,7 @@
 bin_PROGRAMS = ggsn
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 AM_LDFLAGS = @EXEC_LDFLAGS@
 
 AM_CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb
@@ -8,5 +10,6 @@ ggsn_LDADD = @LIBOBJS@ @EXEC_LDADD@ -lgtp -L../gtp
 
 #ggsn_DEPENDENCIES = ../gtp/libgtp.la
 
-ggsn_SOURCES = ggsn.c tun.c tun.h cmdline.c cmdline.h ippool.h ippool.c syserr.h syserr.c lookup.c lookup.h
+ggsn_SOURCES = ggsn.c ../lib/tun.c ../lib/tun.h cmdline.c cmdline.h ../lib/ippool.h ../lib/ippool.c ../lib/syserr.h ../lib/syserr.c ../lib/lookup.c ../lib/lookup.h
+#ggsn_SOURCES = ggsn.c cmdline.c cmdline.h
 
diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c
@@ -47,9 +47,9 @@
 
 #include <time.h>
 
-#include "tun.h"
-#include "ippool.h"
-#include "syserr.h"
+#include "../lib/tun.h"
+#include "../lib/ippool.h"
+#include "../lib/syserr.h"
 #include "../gtp/pdp.h"
 #include "../gtp/gtp.h"
 #include "cmdline.h"

diff --git a/ggsn/getopt.c → lib/getopt.c b/ggsn/getopt.c → lib/getopt.c
diff --git a/ggsn/getopt1.c → lib/getopt1.c b/ggsn/getopt1.c → lib/getopt1.c
diff --git a/ggsn/gnugetopt.h → lib/gnugetopt.h b/ggsn/gnugetopt.h → lib/gnugetopt.h
diff --git a/ggsn/ippool.c → lib/ippool.c b/ggsn/ippool.c → lib/ippool.c
diff --git a/ggsn/ippool.h → lib/ippool.h b/ggsn/ippool.h → lib/ippool.h
diff --git a/ggsn/lookup.c → lib/lookup.c b/ggsn/lookup.c → lib/lookup.c
diff --git a/ggsn/lookup.h → lib/lookup.h b/ggsn/lookup.h → lib/lookup.h
diff --git a/ggsn/syserr.c → lib/syserr.c b/ggsn/syserr.c → lib/syserr.c
diff --git a/ggsn/syserr.h → lib/syserr.h b/ggsn/syserr.h → lib/syserr.h
diff --git a/ggsn/tun.c → lib/tun.c b/ggsn/tun.c → lib/tun.c
diff --git a/ggsn/tun.h → lib/tun.h b/ggsn/tun.h → lib/tun.h
diff --git a/sgsnemu/Makefile.am b/sgsnemu/Makefile.am
@@ -1,5 +1,7 @@
 bin_PROGRAMS = sgsnemu
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 AM_LDFLAGS = @EXEC_LDFLAGS@
 
 AM_CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb
@@ -8,4 +10,5 @@ sgsnemu_LDADD = @LIBOBJS@ @EXEC_LDADD@ -lgtp -L../gtp
 
 #sgsnemu_DEPENDENCIES = ../gtp/libgtp.la
 
-sgsnemu_SOURCES = sgsnemu.c tun.c tun.h cmdline.c cmdline.h ippool.h ippool.c syserr.h syserr.c lookup.c lookup.h
+sgsnemu_SOURCES = sgsnemu.c ../lib/tun.c ../lib/tun.h cmdline.c cmdline.h ../lib/ippool.h ../lib/ippool.c ../lib/syserr.h ../lib/syserr.c ../lib/lookup.c ../lib/lookup.h
+#sgsnemu_SOURCES = sgsnemu.c cmdline.c cmdline.h