StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #550 from jin-eld/automake-portability

Browse Source 
Forward compatibility with automake 1.14
This commit is contained in:
irungentoo 2013-09-01 14:35:56 -07:00
commit 86c748e755
9 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -49,6 +49,7 @@ libtool
.deps .deps
.libs .libs
.dirstamp
#netbeans #netbeans
nbproject nbproject

1
Makefile.am
View File

@ -1,7 +1,6 @@
SUBDIRS = build SUBDIRS = build
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = subdir-objects
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = $(top_builddir)/libtoxcore.pc pkgconfig_DATA = $(top_builddir)/libtoxcore.pc

4
auto_tests/Makefile.inc
View File

@ -5,7 +5,7 @@ TESTS = messenger_autotest crypto_test
check_PROGRAMS = messenger_autotest crypto_test check_PROGRAMS = messenger_autotest crypto_test
messenger_autotest_SOURCES = \ messenger_autotest_SOURCES = \
$(top_srcdir)/auto_tests/messenger_test.c ../auto_tests/messenger_test.c
messenger_autotest_CFLAGS = \ messenger_autotest_CFLAGS = \
$(LIBSODIUM_CFLAGS) \ $(LIBSODIUM_CFLAGS) \
@ -18,7 +18,7 @@ messenger_autotest_LDADD = \
$(CHECK_LIBS) $(CHECK_LIBS)
crypto_test_SOURCES = $(top_srcdir)/auto_tests/crypto_test.c crypto_test_SOURCES = ../auto_tests/crypto_test.c
crypto_test_CFLAGS = $(LIBSODIUM_CFLAGS) \ crypto_test_CFLAGS = $(LIBSODIUM_CFLAGS) \
$(CHECK_CFLAGS) $(CHECK_CFLAGS)

10
build/Makefile.am
View File

@ -3,8 +3,8 @@ noinst_PROGRAMS =
noinst_bindir = $(top_builddir)/build noinst_bindir = $(top_builddir)/build
EXTRA_DIST= EXTRA_DIST=
include $(top_srcdir)/toxcore/Makefile.inc include ../toxcore/Makefile.inc
include $(top_srcdir)/other/Makefile.inc include ../other/Makefile.inc
include $(top_srcdir)/testing/Makefile.inc include ../testing/Makefile.inc
include $(top_srcdir)/other/bootstrap_serverdaemon/Makefile.inc include ../other/bootstrap_serverdaemon/Makefile.inc
include $(top_srcdir)/auto_tests/Makefile.inc include ../auto_tests/Makefile.inc

3
configure.ac
View File

@ -6,7 +6,7 @@ AC_INIT([tox], [0.0.0], [http://tox.im])
AC_CONFIG_AUX_DIR(configure_aux) AC_CONFIG_AUX_DIR(configure_aux)
AC_CONFIG_SRCDIR([toxcore/net_crypto.c]) AC_CONFIG_SRCDIR([toxcore/net_crypto.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.10 -Wall]) AM_INIT_AUTOMAKE([1.10 -Wall subdir-objects])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
@ -107,6 +107,7 @@ AC_ARG_WITH(libsodium-libs,
# Checks for programs. # Checks for programs.
AC_PROG_CC AC_PROG_CC
AM_PROG_CC_C_O AM_PROG_CC_C_O
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL AC_PROG_LIBTOOL

6
other/Makefile.inc
View File

@ -1,8 +1,8 @@
noinst_PROGRAMS += DHT_bootstrap noinst_PROGRAMS += DHT_bootstrap
DHT_bootstrap_SOURCES = $(top_srcdir)/other/DHT_bootstrap.c \ DHT_bootstrap_SOURCES = ../other/DHT_bootstrap.c \
$(top_srcdir)/toxcore/DHT.h \ ../toxcore/DHT.h \
$(top_srcdir)/toxcore/friend_requests.h ../toxcore/friend_requests.h
DHT_bootstrap_CFLAGS = -I$(top_srcdir)/other \ DHT_bootstrap_CFLAGS = -I$(top_srcdir)/other \
$(LIBSODIUM_CFLAGS) $(LIBSODIUM_CFLAGS)

2
other/bootstrap_serverdaemon/Makefile.inc
View File

@ -3,7 +3,7 @@ if BUILD_DHT_BOOTSTRAP_DAEMON
noinst_PROGRAMS += DHT_bootstrap_daemon noinst_PROGRAMS += DHT_bootstrap_daemon
DHT_bootstrap_daemon_SOURCES = \ DHT_bootstrap_daemon_SOURCES = \
$(top_srcdir)/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c ../other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
DHT_bootstrap_daemon_CFLAGS = \ DHT_bootstrap_daemon_CFLAGS = \
-I$(top_srcdir)/other/bootstrap_serverdaemon \ -I$(top_srcdir)/other/bootstrap_serverdaemon \

15
testing/Makefile.inc
View File

@ -2,8 +2,8 @@ if BUILD_NTOX
bin_PROGRAMS += nTox bin_PROGRAMS += nTox
nTox_SOURCES = $(top_srcdir)/testing/nTox.h \ nTox_SOURCES = ../testing/nTox.h \
$(top_srcdir)/testing/nTox.c ../testing/nTox.c
nTox_CFLAGS = $(LIBSODIUM_CFLAGS) \ nTox_CFLAGS = $(LIBSODIUM_CFLAGS) \
$(NCURSES_CFLAGS) $(NCURSES_CFLAGS)
@ -22,7 +22,7 @@ noinst_PROGRAMS += DHT_test \
Messenger_test \ Messenger_test \
crypto_speed_test crypto_speed_test
DHT_test_SOURCES = $(top_srcdir)/testing/DHT_test.c DHT_test_SOURCES = ../testing/DHT_test.c
DHT_test_CFLAGS = $(LIBSODIUM_CFLAGS) DHT_test_CFLAGS = $(LIBSODIUM_CFLAGS)
@ -33,7 +33,7 @@ DHT_test_LDADD = $(LIBSODIUM_LDFLAGS) \
Lossless_UDP_testclient_SOURCES = \ Lossless_UDP_testclient_SOURCES = \
$(top_srcdir)/testing/Lossless_UDP_testclient.c ../testing/Lossless_UDP_testclient.c
Lossless_UDP_testclient_CFLAGS = \ Lossless_UDP_testclient_CFLAGS = \
$(LIBSODIUM_CFLAGS) $(LIBSODIUM_CFLAGS)
@ -46,7 +46,7 @@ Lossless_UDP_testclient_LDADD = \
Lossless_UDP_testserver_SOURCES = \ Lossless_UDP_testserver_SOURCES = \
$(top_srcdir)/testing/Lossless_UDP_testserver.c ../testing/Lossless_UDP_testserver.c
Lossless_UDP_testserver_CFLAGS = \ Lossless_UDP_testserver_CFLAGS = \
$(LIBSODIUM_CFLAGS) $(LIBSODIUM_CFLAGS)
@ -59,7 +59,7 @@ Lossless_UDP_testserver_LDADD = \
Messenger_test_SOURCES = \ Messenger_test_SOURCES = \
$(top_srcdir)/testing/Messenger_test.c ../testing/Messenger_test.c
Messenger_test_CFLAGS = $(LIBSODIUM_CFLAGS) Messenger_test_CFLAGS = $(LIBSODIUM_CFLAGS)
@ -70,7 +70,7 @@ Messenger_test_LDADD = $(LIBSODIUM_LDFLAGS) \
crypto_speed_test_SOURCES = \ crypto_speed_test_SOURCES = \
$(top_srcdir)/testing/crypto_speed_test.c ../testing/crypto_speed_test.c
crypto_speed_test_CFLAGS = \ crypto_speed_test_CFLAGS = \
$(LIBSODIUM_CFLAGS) $(LIBSODIUM_CFLAGS)
@ -81,3 +81,4 @@ crypto_speed_test_LDADD = \
$(LIBSODIUM_LIBS) \ $(LIBSODIUM_LIBS) \
$(WINSOCK2_LIBS) $(WINSOCK2_LIBS)
EXTRA_DIST += $(top_srcdir)/testing/misc_tools.c

44
toxcore/Makefile.inc
View File

@ -1,31 +1,31 @@
lib_LTLIBRARIES = libtoxcore.la lib_LTLIBRARIES = libtoxcore.la
libtoxcore_la_include_HEADERS = \ libtoxcore_la_include_HEADERS = \
$(top_srcdir)/toxcore/tox.h ../toxcore/tox.h
libtoxcore_la_includedir = $(includedir)/tox libtoxcore_la_includedir = $(includedir)/tox
libtoxcore_la_SOURCES = $(top_srcdir)/toxcore/DHT.h \ libtoxcore_la_SOURCES = ../toxcore/DHT.h \
$(top_srcdir)/toxcore/DHT.c \ ../toxcore/DHT.c \
$(top_srcdir)/toxcore/network.h \ ../toxcore/network.h \
$(top_srcdir)/toxcore/network.c \ ../toxcore/network.c \
$(top_srcdir)/toxcore/Lossless_UDP.h \ ../toxcore/Lossless_UDP.h \
$(top_srcdir)/toxcore/Lossless_UDP.c \ ../toxcore/Lossless_UDP.c \
$(top_srcdir)/toxcore/net_crypto.h \ ../toxcore/net_crypto.h \
$(top_srcdir)/toxcore/net_crypto.c \ ../toxcore/net_crypto.c \
$(top_srcdir)/toxcore/friend_requests.h \ ../toxcore/friend_requests.h \
$(top_srcdir)/toxcore/friend_requests.c \ ../toxcore/friend_requests.c \
$(top_srcdir)/toxcore/LAN_discovery.h \ ../toxcore/LAN_discovery.h \
$(top_srcdir)/toxcore/LAN_discovery.c \ ../toxcore/LAN_discovery.c \
$(top_srcdir)/toxcore/Messenger.h \ ../toxcore/Messenger.h \
$(top_srcdir)/toxcore/Messenger.c \ ../toxcore/Messenger.c \
$(top_srcdir)/toxcore/ping.h \ ../toxcore/ping.h \
$(top_srcdir)/toxcore/ping.c \ ../toxcore/ping.c \
$(top_srcdir)/toxcore/tox.h \ ../toxcore/tox.h \
$(top_srcdir)/toxcore/tox.c \ ../toxcore/tox.c \
$(top_srcdir)/toxcore/util.h \ ../toxcore/util.h \
$(top_srcdir)/toxcore/util.c \ ../toxcore/util.c \
$(top_srcdir)/toxcore/misc_tools.h ../toxcore/misc_tools.h
libtoxcore_la_CFLAGS = -I$(top_srcdir) \ libtoxcore_la_CFLAGS = -I$(top_srcdir) \
-I$(top_srcdir)/toxcore \ -I$(top_srcdir)/toxcore \