diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2012-11-02 10:00:10 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2012-11-06 13:59:59 +0100 |
| commit | e071e30937373337afa32441e13a106f7bff2714 (patch) | |
| tree | 978b7a04907432a8421ce96d89652a9b543e03b3 | |
| parent | 3d7500e68640f4914b358dee3dcbd2cba97b8679 (diff) | |
build: Remove subdir-objects as it breaks make distclean
We are not using this option in any of our projects and it is breaking
make distclean. Remove the option for now.
make[2]: Entering directory `/openggsn-0.91/_build/ggsn'
Makefile:307: ../lib/.deps/getopt.Po: No such file or directory
Makefile:308: ../lib/.deps/getopt1.Po: No such file or directory
make[2]: *** No rule to make target `../lib/.deps/getopt1.Po'. Stop.
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | ggsn/Makefile.am | 4 | ||||
| -rw-r--r-- | sgsnemu/Makefile.am | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/configure.in b/configure.in index 9761df7..a4a281b 100644 --- a/configure.in +++ b/configure.in @@ -15,15 +15,11 @@ AC_PROG_INSTALL AC_PROG_AWK AC_PROG_CPP AC_PROG_CXX -AC_PROG_RANLIB +LT_INIT AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_LIBOBJ_DIR([lib]) -#JJAKO Check for libtool -AC_PROG_LIBTOOL -AM_PROG_LIBTOOL - AC_ARG_ENABLE(static-exec, [ --enable-static-exec Enable static linking of executables], [ EXEC_LDFLAGS="-all-static"]) diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am index 91aa726..ada5720 100644 --- a/ggsn/Makefile.am +++ b/ggsn/Makefile.am @@ -1,12 +1,10 @@ bin_PROGRAMS = ggsn -AUTOMAKE_OPTIONS = subdir-objects - AM_LDFLAGS = @EXEC_LDFLAGS@ AM_CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb -ggsn_LDADD = @LIBOBJS@ @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a +ggsn_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a ggsn_SOURCES = ggsn.c cmdline.c cmdline.h diff --git a/sgsnemu/Makefile.am b/sgsnemu/Makefile.am index e6b1d7d..8ce1b61 100644 --- a/sgsnemu/Makefile.am +++ b/sgsnemu/Makefile.am @@ -1,11 +1,9 @@ bin_PROGRAMS = sgsnemu -AUTOMAKE_OPTIONS = subdir-objects - AM_LDFLAGS = @EXEC_LDFLAGS@ AM_CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb -sgsnemu_LDADD = @LIBOBJS@ @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a +sgsnemu_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a sgsnemu_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a sgsnemu_SOURCES = sgsnemu.c cmdline.c cmdline.h |