From fc4047503739840d3964356734dc667d6905edcd Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Tue, 26 Jun 2012 17:58:07 +0000 Subject: [PATCH] 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. --- libs/libzrtp/.gitignore | 4 +++ libs/libzrtp/{projects/gnu => }/COPYING | 0 libs/libzrtp/{projects/gnu => }/INSTALL | 0 libs/libzrtp/{projects/gnu => }/Makefile.am | 8 ++--- libs/libzrtp/{projects/gnu => }/NEWS | 0 libs/libzrtp/{projects/gnu => }/acinclude.m4 | 0 libs/libzrtp/{projects/gnu => }/bootstrap.sh | 2 +- .../{projects/gnu => }/build/Makefile.am | 2 +- .../{projects/gnu => }/build/test/Makefile.am | 2 +- libs/libzrtp/{projects/gnu => }/configure.in | 6 ++-- .../libzrtp/{projects/gnu => }/create_docs.sh | 2 -- .../libzrtp/{projects/gnu => }/create_pack.pl | 0 libs/libzrtp/projects/gnu/.gitignore | 10 ------- libs/libzrtp/projects/gnu/AUTHORS | 30 ------------------- libs/libzrtp/projects/gnu/ChangeLog | 1 - libs/libzrtp/projects/gnu/README | 0 16 files changed, 14 insertions(+), 53 deletions(-) rename libs/libzrtp/{projects/gnu => }/COPYING (100%) rename libs/libzrtp/{projects/gnu => }/INSTALL (100%) rename libs/libzrtp/{projects/gnu => }/Makefile.am (90%) rename libs/libzrtp/{projects/gnu => }/NEWS (100%) rename libs/libzrtp/{projects/gnu => }/acinclude.m4 (100%) rename libs/libzrtp/{projects/gnu => }/bootstrap.sh (77%) rename libs/libzrtp/{projects/gnu => }/build/Makefile.am (98%) rename libs/libzrtp/{projects/gnu => }/build/test/Makefile.am (98%) rename libs/libzrtp/{projects/gnu => }/configure.in (96%) rename libs/libzrtp/{projects/gnu => }/create_docs.sh (81%) rename libs/libzrtp/{projects/gnu => }/create_pack.pl (100%) delete mode 100644 libs/libzrtp/projects/gnu/.gitignore delete mode 100644 libs/libzrtp/projects/gnu/AUTHORS delete mode 100644 libs/libzrtp/projects/gnu/ChangeLog delete mode 100644 libs/libzrtp/projects/gnu/README diff --git a/libs/libzrtp/.gitignore b/libs/libzrtp/.gitignore index 89bab134d9..ea9c7b1f3d 100644 --- a/libs/libzrtp/.gitignore +++ b/libs/libzrtp/.gitignore @@ -1,4 +1,8 @@ # -*- mode:conf -*- /.cproject /.project +/Makefile +/Makefile.in +/_configs.sed +/config/ /include/zrtp_config_unix.h diff --git a/libs/libzrtp/projects/gnu/COPYING b/libs/libzrtp/COPYING similarity index 100% rename from libs/libzrtp/projects/gnu/COPYING rename to libs/libzrtp/COPYING diff --git a/libs/libzrtp/projects/gnu/INSTALL b/libs/libzrtp/INSTALL similarity index 100% rename from libs/libzrtp/projects/gnu/INSTALL rename to libs/libzrtp/INSTALL diff --git a/libs/libzrtp/projects/gnu/Makefile.am b/libs/libzrtp/Makefile.am similarity index 90% rename from libs/libzrtp/projects/gnu/Makefile.am rename to libs/libzrtp/Makefile.am index 48b8c578a5..d4916e3cf8 100644 --- a/libs/libzrtp/projects/gnu/Makefile.am +++ b/libs/libzrtp/Makefile.am @@ -5,9 +5,9 @@ # Viktor Krikun # -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: diff --git a/libs/libzrtp/projects/gnu/NEWS b/libs/libzrtp/NEWS similarity index 100% rename from libs/libzrtp/projects/gnu/NEWS rename to libs/libzrtp/NEWS diff --git a/libs/libzrtp/projects/gnu/acinclude.m4 b/libs/libzrtp/acinclude.m4 similarity index 100% rename from libs/libzrtp/projects/gnu/acinclude.m4 rename to libs/libzrtp/acinclude.m4 diff --git a/libs/libzrtp/projects/gnu/bootstrap.sh b/libs/libzrtp/bootstrap.sh similarity index 77% rename from libs/libzrtp/projects/gnu/bootstrap.sh rename to libs/libzrtp/bootstrap.sh index 1559388ad1..dfa3cc3652 100755 --- a/libs/libzrtp/projects/gnu/bootstrap.sh +++ b/libs/libzrtp/bootstrap.sh @@ -9,6 +9,6 @@ reconf () { automake --no-force --add-missing --copy } -(cd ../../third_party/bnlib && ./bootstrap.sh) +(cd third_party/bnlib && ./bootstrap.sh) reconf diff --git a/libs/libzrtp/projects/gnu/build/Makefile.am b/libs/libzrtp/build/Makefile.am similarity index 98% rename from libs/libzrtp/projects/gnu/build/Makefile.am rename to libs/libzrtp/build/Makefile.am index 8d6e0a0a45..4252e672ec 100644 --- a/libs/libzrtp/projects/gnu/build/Makefile.am +++ b/libs/libzrtp/build/Makefile.am @@ -5,7 +5,7 @@ # Viktor Krikun # -TOP_SRCDIR=$(top_srcdir)/../.. +TOP_SRCDIR=$(top_srcdir) INCLUDES = -I$(TOP_SRCDIR)/include \ -I$(TOP_SRCDIR)/. \ -I$(TOP_SRCDIR)/third_party/bgaes \ diff --git a/libs/libzrtp/projects/gnu/build/test/Makefile.am b/libs/libzrtp/build/test/Makefile.am similarity index 98% rename from libs/libzrtp/projects/gnu/build/test/Makefile.am rename to libs/libzrtp/build/test/Makefile.am index 558b2b9e5a..b8f9a9abb9 100644 --- a/libs/libzrtp/projects/gnu/build/test/Makefile.am +++ b/libs/libzrtp/build/test/Makefile.am @@ -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)/. \ diff --git a/libs/libzrtp/projects/gnu/configure.in b/libs/libzrtp/configure.in similarity index 96% rename from libs/libzrtp/projects/gnu/configure.in rename to libs/libzrtp/configure.in index 7d97319a76..34feb59a91 100644 --- a/libs/libzrtp/projects/gnu/configure.in +++ b/libs/libzrtp/configure.in @@ -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. diff --git a/libs/libzrtp/projects/gnu/create_docs.sh b/libs/libzrtp/create_docs.sh similarity index 81% rename from libs/libzrtp/projects/gnu/create_docs.sh rename to libs/libzrtp/create_docs.sh index 1999a1b14a..a30c7c256b 100755 --- a/libs/libzrtp/projects/gnu/create_docs.sh +++ b/libs/libzrtp/create_docs.sh @@ -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 diff --git a/libs/libzrtp/projects/gnu/create_pack.pl b/libs/libzrtp/create_pack.pl similarity index 100% rename from libs/libzrtp/projects/gnu/create_pack.pl rename to libs/libzrtp/create_pack.pl diff --git a/libs/libzrtp/projects/gnu/.gitignore b/libs/libzrtp/projects/gnu/.gitignore deleted file mode 100644 index 0920c730f6..0000000000 --- a/libs/libzrtp/projects/gnu/.gitignore +++ /dev/null @@ -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 diff --git a/libs/libzrtp/projects/gnu/AUTHORS b/libs/libzrtp/projects/gnu/AUTHORS deleted file mode 100644 index 5d67c092cd..0000000000 --- a/libs/libzrtp/projects/gnu/AUTHORS +++ /dev/null @@ -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 - 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. diff --git a/libs/libzrtp/projects/gnu/ChangeLog b/libs/libzrtp/projects/gnu/ChangeLog deleted file mode 100644 index 709dcbe6f8..0000000000 --- a/libs/libzrtp/projects/gnu/ChangeLog +++ /dev/null @@ -1 +0,0 @@ -Change Log is available at [https://developers.zfoneproject.com/libzrtp/wiki/LibzrtpChangeLog] \ No newline at end of file diff --git a/libs/libzrtp/projects/gnu/README b/libs/libzrtp/projects/gnu/README deleted file mode 100644 index e69de29bb2..0000000000