Build from the root directory

Move all the GNU build files to the root directory so that we look
like a normal *NIX-centric project.

Thanks to Viktor Krikrun for an initial patch here.  For this commit,
I ended up redoing the move from scratch to separate out this move
from other changes.
This commit is contained in:
Travis Cross 2012-06-26 17:58:07 +00:00
parent 670f61be4d
commit fc40475037
16 changed files with 14 additions and 53 deletions

View File

@ -1,4 +1,8 @@
# -*- mode:conf -*-
/.cproject
/.project
/Makefile
/Makefile.in
/_configs.sed
/config/
/include/zrtp_config_unix.h

View File

@ -5,9 +5,9 @@
# Viktor Krikun <v.krikun@soft-industry.com> <v.krikun@gmail.com>
#
TEST_DIR=$(top_srcdir)/../../test
TOP_SRCDIR=$(top_srcdir)/../../include
THIRD_DIR=$(top_srcdir)/../../third_party
TEST_DIR=$(top_srcdir)/test
TOP_SRCDIR=$(top_srcdir)/include
THIRD_DIR=$(top_srcdir)/third_party
libzrtp_includedir=$(includedir)/libzrtp
@ -49,7 +49,7 @@ if ZRTP_BUILD_ENTERPRISE
libzrtp_include_HEADERS += $(TOP_SRCDIR)/zrtp_ec.h
endif
SUBDIRS = ../../third_party/bnlib
SUBDIRS = third_party/bnlib
SUBDIRS += build
uninstall:

View File

@ -9,6 +9,6 @@ reconf () {
automake --no-force --add-missing --copy
}
(cd ../../third_party/bnlib && ./bootstrap.sh)
(cd third_party/bnlib && ./bootstrap.sh)
reconf

View File

@ -5,7 +5,7 @@
# Viktor Krikun <v.krikun@soft-industry.com> <v.krikun@gmail.com>
#
TOP_SRCDIR=$(top_srcdir)/../..
TOP_SRCDIR=$(top_srcdir)
INCLUDES = -I$(TOP_SRCDIR)/include \
-I$(TOP_SRCDIR)/. \
-I$(TOP_SRCDIR)/third_party/bgaes \

View File

@ -7,7 +7,7 @@
TOP_SRCDIR=$(top_srcdir)/../..
TOP_SRCDIR=$(top_srcdir)
INCLUDES = -I$(TOP_SRCDIR)/include \
-I$(TOP_SRCDIR)/include/enterprise \
-I$(TOP_SRCDIR)/. \

View File

@ -33,15 +33,15 @@ esac
AM_INIT_AUTOMAKE([libzrtp], [1.15])
AX_PREFIX_CONFIG_H(../../include/zrtp_config_unix.h,ZRTP,config/config.h)
AX_PREFIX_CONFIG_H(include/zrtp_config_unix.h,ZRTP,config/config.h)
CFLAGS="$CFLAGS -Wno-unused-parameter -fno-strict-aliasing -fPIC -DZRTP_AUTOMAKE=1"
# Configuring external libraries
echo "========================= configuring bnlib =============================="
cd ./../../third_party/bnlib
cd third_party/bnlib
./configure CFLAGS="$CFLAGS"
cd ../../projects/gnu
cd ../..
echo "================================ done ==================================="
# Checks for programs.

View File

@ -7,5 +7,3 @@ mkdir libzrtp-doc
cp -Rf ./out/html/* ./libzrtp-doc
tar -zcvf ./libzrtp-doc.tar.gz ./libzrtp-doc >> /dev/null
rm -rf libzrtp-doc
mv libzrtp-doc.tar.gz ../projects/gnu
cd ../projects/gnu

View File

@ -1,10 +0,0 @@
# -*- mode:conf -*-
/Makefile
/Makefile.in
/_configs.sed
/build/Makefile
/build/Makefile.in
/build/test/Makefile
/build/test/Makefile.in
/config/config.h
/config/stamp-h1

View File

@ -1,30 +0,0 @@
libzrtp betta
Copyright (c) 2005-2008 Philip Zimmermann. All rights reserved.
Contact Phil at: www.philzimmermann.com
Visit the Zfone Project Home Page http://zfoneproject.com/
Report bugs via the Zfone Bugs Page http://zfoneproject.com/bugs.html
Created by Phil Zimmermann.
Developers:
Viktor Krikun <v.krikun@soft-industry.com> <v.krikun@gmail.com>
Nikolay Popok
Vitaly Rozhkov
Andrey Rozinko
Bryce Wilcox-O'Hearn
Thanks to:
Alan Johnston
Jon Callas
Hal Finney
Colin Plumb
Sagar Pai
Werner Dittmann
L. Amber Wilcox-O'Hearn
Ariel Boston
Donovan Preston
Software development services provided by Svitla Systems and http://www.soft-industry.com/en.
Portions of this software are available under open source licenses from other authors.
Notably, Brian Gladman's AES implementation, and David McGrew's libSRTP package.

View File

@ -1 +0,0 @@
Change Log is available at [https://developers.zfoneproject.com/libzrtp/wiki/LibzrtpChangeLog]