Permalink
Browse files

Revert "from flameeyes: build: replace libcompat with libcommon and m…

…ove common functions there."

Seems like there is a bug with using `SUBDIRS = . lib`, sources in lib/ and `subdir-objects`.

This reverts commit d1caf3f.
  • Loading branch information...
Flameeyes committed Jun 21, 2012
1 parent d1caf3f commit 455a675bc90481863cc5ba80fe326c4ddc8708fb
Showing with 12 additions and 14 deletions.
  1. +1 −8 Makefile.am
  2. +5 −0 compat/Makefile.am
  3. +1 −1 configure.ac
  4. +3 −3 lib/Makefile.am
  5. +1 −1 login_duo/Makefile.am
  6. +1 −1 pam_duo/Makefile.am
View
@@ -1,14 +1,7 @@
ACLOCAL_AMFLAGS = -I autotools
-noinst_LTLIBRARIES = libcommon.la
-
-libcommon_la_SOURCES = \
- lib/groupaccess.c lib/groupaccess.h \
- lib/match.c lib/match.h
-libcommon_la_LIBADD = @LTLIBOBJS@
-
-SUBDIRS = . lib login_duo
+SUBDIRS = compat lib login_duo
if PAM
SUBDIRS += pam_duo
View
@@ -0,0 +1,5 @@
+
+noinst_LTLIBRARIES = libcompat.la
+libcompat_la_SOURCES = dummy.c
+libcompat_la_LIBADD = @LTLIBOBJS@
+
View
@@ -168,6 +168,6 @@ AC_REPLACE_FUNCS([asprintf getgrouplist strlcpy vsyslog])
AC_SEARCH_LIBS(inet_ntoa, nsl)
AC_SEARCH_LIBS(gethostbyname, resolv nsl)
-AC_CONFIG_FILES(Makefile lib/Makefile lib/libduo.pc login_duo/Makefile pam_duo/Makefile duo_unix.spec tests/Makefile)
+AC_CONFIG_FILES(Makefile compat/Makefile lib/Makefile lib/libduo.pc login_duo/Makefile pam_duo/Makefile duo_unix.spec tests/Makefile)
AC_OUTPUT
View
@@ -3,10 +3,10 @@ AM_CPPFLAGS = -I$(top_srcdir)/compat @OPENSSL_INCLUDES@
lib_LTLIBRARIES = libduo.la
-libduo_la_SOURCES = bson.h bson.c cacert.h duo.c \
+libduo_la_SOURCES = bson.h bson.c cacert.h duo.c groupaccess.h groupaccess.c \
http_parser.h http_parser.c https.h https.c ini.h ini.c \
- urlenc.h urlenc.c
-libduo_la_LIBADD = ../libcommon.la @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+ match.h match.c urlenc.h urlenc.c
+libduo_la_LIBADD = $(top_builddir)/compat/libcompat.la @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
# http://sourceware.org/autobook/autobook/autobook_91.html
libduo_la_LDFLAGS = -no-undefined -version-info 3:0:0 -export-symbols-regex '^duo_'
View
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/compat -I$(top_srcdir)/lib @OPENSSL_INCLUDES@
sbin_PROGRAMS = login_duo
login_duo_SOURCES = login_duo.c
-login_duo_LDADD = $(top_builddir)/lib/libduo.la $(top_builddir)/libcommon.la @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
+login_duo_LDADD = $(top_builddir)/lib/libduo.la @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
notrans_dist_man8_MANS = login_duo.8
View
@@ -6,7 +6,7 @@ pam_lib_LTLIBRARIES = pam_duo.la
pam_duo_la_DEFS = -DDEBUG_PAM -DPAM_DEBUG @DEFS@
pam_duo_la_SOURCES = pam_duo.c pam_extra.h pam_extra.c
-pam_duo_la_LIBADD = $(top_builddir)/lib/libduo.la $(top_builddir)/libcommon.la @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@ -lpam
+pam_duo_la_LIBADD = $(top_builddir)/lib/libduo.la @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@ -lpam
pam_duo_la_LDFLAGS = -module -no-undefined -avoid-version -shared -export-symbols-regex '^pam_sm_'
notrans_dist_man8_MANS = pam_duo.8

0 comments on commit 455a675

Please sign in to comment.