Permalink
Browse files

Merge branch 'master' of github.com:maxfeldman14/PHELONY

  • Loading branch information...
2 parents 26f0b57 + bf14dc4 commit 8665cdeb2158df6e7695d275155b904ef5e383b7 Max committed Apr 24, 2012
@@ -1,5 +1,5 @@
# autoreconf by-products
-*.in
+#*.in
aclocal.m4
autom4te.cache/
@@ -1,5 +1,5 @@
INCLUDES = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
+AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) -ldl
LDADD = ../common/liblayer23.a $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS)
noinst_LIBRARIES = libmobile.a
@@ -53,7 +53,6 @@ AM_V_at = $(am__v_at_$(V))
am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
am__v_at_0 = @
libmobile_a_AR = $(AR) $(ARFLAGS)
-# need to add both libssl and libcrypto to use SSL functionality
libmobile_a_LIBADD = /usr/lib/libssl.a /usr/lib/libcrypto.a
am_libmobile_a_OBJECTS = gsm322.$(OBJEXT) gsm480_ss.$(OBJEXT) \
gsm411_sms.$(OBJEXT) gsm48_cc.$(OBJEXT) gsm48_mm.$(OBJEXT) \
@@ -80,7 +79,7 @@ AM_V_CC = $(am__v_CC_$(V))
am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
am__v_CC_0 = @echo " CC " $@;
CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -ldl -o $@
AM_V_CCLD = $(am__v_CCLD_$(V))
am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
am__v_CCLD_0 = @echo " CCLD " $@;
@@ -192,16 +191,15 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
INCLUDES = $(all_includes) -I$(top_srcdir)/include
-AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
+AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) -ldl
LDADD = ../common/liblayer23.a $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOCODEC_LIBS)
noinst_LIBRARIES = libmobile.a
libmobile_a_SOURCES = gsm322.c gsm480_ss.c gsm411_sms.c gsm48_cc.c gsm48_mm.c \
gsm48_rr.c mnccms.c settings.c subscriber.c support.c \
transaction.c vty_interface.c voice.c mncc_sock.c
mobile_SOURCES = main.c app_mobile.c
-#libssl and libcrypto were added
-mobile_LDADD = libmobile.a $(LDADD) /usr/lib/libssl.a /usr/lib/libcrypto.a
+mobile_LDADD = libmobile.a $(LDADD) /usr/lib/libssl.a /usr/lib/libcrypto.a -ldl -lz
all: all-am
.SUFFIXES:
@@ -66,7 +66,9 @@ doc/html.tar
src/crc*gen.c
include/osmocom/core/crc*gen.h
-
+build-target/doc/*
+build-host/doc/*
+build-target/tests/atconfig
# vi files
*.sw?
@@ -4,14 +4,13 @@
# The test suite will define top_srcdir=/../.. etc.
at_testdir='tests'
-abs_builddir='/home/max/phonetest/PHELONY/src/shared/libosmocore/build-target/tests'
+abs_builddir='/home/dingo/School/sp12/cs194/repos/PHELONY/src/shared/libosmocore/build-target/tests'
at_srcdir='../../tests'
-abs_srcdir='/home/max/phonetest/PHELONY/src/shared/libosmocore/build-target/../tests'
+abs_srcdir='/home/dingo/School/sp12/cs194/repos/PHELONY/src/shared/libosmocore/build-target/../tests'
at_top_srcdir='../..'
-abs_top_srcdir='/home/max/phonetest/PHELONY/src/shared/libosmocore/build-target/..'
+abs_top_srcdir='/home/dingo/School/sp12/cs194/repos/PHELONY/src/shared/libosmocore/build-target/..'
at_top_build_prefix='../'
-abs_top_builddir='/home/max/phonetest/PHELONY/src/shared/libosmocore/build-target'
-
+abs_top_builddir='/home/dingo/School/sp12/cs194/repos/PHELONY/src/shared/libosmocore/build-target'
# Backward compatibility with Autotest <= 2.59b:
at_top_builddir=$at_top_build_prefix
@@ -16,9 +16,9 @@ MEMORY
/* lowram: could be anything, we place exception vectors here */
XRAM (rw) : ORIGIN = 0x00800000, LENGTH = 0x00020000
/* highram binary: our text, initialized data */
- LRAM (rw) : ORIGIN = 0x00820000, LENGTH = 0x00014000
+ LRAM (rw) : ORIGIN = 0x00820000, LENGTH = 0x00015000
/* highram binary: our unitialized data, stacks, heap */
- IRAM (rw) : ORIGIN = 0x00834000, LENGTH = 0x0000c000
+ IRAM (rw) : ORIGIN = 0x00835000, LENGTH = 0x0000c000
}
SECTIONS
{
@@ -11,9 +11,9 @@ ENTRY(_start)
MEMORY
{
/* compal-loaded binary: our text, initialized data */
- LRAM (rw) : ORIGIN = 0x00800000, LENGTH = 0x00014000
+ LRAM (rw) : ORIGIN = 0x00800000, LENGTH = 0x00015000
/* compal-loaded binary: our unitialized data, stacks, heap */
- IRAM (rw) : ORIGIN = 0x00814000, LENGTH = 0x0000c000
+ IRAM (rw) : ORIGIN = 0x00815000, LENGTH = 0x0000c000
}
SECTIONS
{

0 comments on commit 8665cde

Please sign in to comment.