Skip to content

Commit

Permalink
Remove libtool usage
Browse files Browse the repository at this point in the history
  • Loading branch information
npmccallum committed Dec 7, 2015
1 parent dd7a936 commit 2924d5e
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
.project
.settings
aclocal.m4
ar-lib
autom4te.cache
build
compile
Expand All @@ -27,7 +28,6 @@ configure
configure-stamp
depcomp
install-sh
ltmain.sh
Makefile.in
Makefile
missing
Expand Down
5 changes: 3 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ AC_INIT(tang, 1)
AC_CONFIG_MACRO_DIRS([m4])
AC_CANONICAL_SYSTEM
AC_PROG_CC_C99
AC_PROG_RANLIB
AC_PROG_SED

AM_INIT_AUTOMAKE([subdir-objects foreign no-dist-gzip dist-bzip2 parallel-tests])
AM_SILENT_RULES([yes])
AM_PROG_CC_C_O

LT_INIT([disable-static])
AM_PROG_AR

PKG_PROG_PKG_CONFIG([0.25])

Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
SUBDIRS = . progs tests

noinst_LTLIBRARIES = libcommon.la
noinst_LIBRARIES = libcommon.a

libcommon_la_SOURCES = \
libcommon_a_SOURCES = \
asn1.c asn1.h \
conv.c conv.h \
pkt.c pkt.h
2 changes: 1 addition & 1 deletion src/progs/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AM_CFLAGS = @TANG_CFLAGS@ @LIBCRYPTO_CFLAGS@
LDADD = ../libcommon.la @LIBCRYPTO_LIBS@
LDADD = ../libcommon.a @LIBCRYPTO_LIBS@

bin_PROGRAMS = tang-gen tang-mod tang-send
libexec_PROGRAMS = tang-serve
Expand Down
6 changes: 3 additions & 3 deletions src/tests/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
AM_CFLAGS = @TANG_CFLAGS@ @LIBCRYPTO_CFLAGS@
LDADD = libtest.la ../libcommon.la @LIBCRYPTO_LIBS@
LDADD = libtest.a ../libcommon.a @LIBCRYPTO_LIBS@

check_LTLIBRARIES = libtest.la
libtest_la_SOURCES = client.c
check_LIBRARIES = libtest.a
libtest_a_SOURCES = client.c

check_PROGRAMS = serve send
TESTS = $(check_PROGRAMS)

0 comments on commit 2924d5e

Please sign in to comment.