compiles on mac; refs #6

master
Marc Wäckerlin 14 years ago
parent 5c62ed3d53
commit dcc9a84734
  1. 2
      COPYING
  2. 2
      INSTALL
  3. 2
      doc/examples/makefile.am
  4. 2
      src/makefile.am
  5. 7
      test/makefile.am

@ -1 +1 @@
/usr/share/automake-1.11/COPYING /opt/local/share/automake-1.11/COPYING

@ -1 +1 @@
/usr/share/automake-1.11/INSTALL /opt/local/share/automake-1.11/INSTALL

@ -17,7 +17,7 @@ endif
LDFLAGS= LDFLAGS=
if MAC if MAC
AM_CPPFLAGS+=-I/Library/OpenSC/include AM_CPPFLAGS+=-I/Library/OpenSC/include
LDFLAGS += -F/System/Library/Frameworks/PCSC.framework -framework PCSC LDFLAGS += -F/System/Library/Frameworks/PCSC.framework -framework PCSC -L/opt/local/lib -lcrypto
endif endif
if !MINGW32 if !MINGW32
if !MAC if !MAC

@ -9,7 +9,7 @@ include_HEADERS = pcsc.hxx cryptoki.hxx openssl.hxx cryptaux.hxx
if MAC if MAC
AM_CPPFLAGS += -I/opt/local/include -I/Library/OpenSC/include AM_CPPFLAGS += -I/opt/local/include -I/Library/OpenSC/include
AM_LDFLAGS = -F/System/Library/Frameworks/PCSC.framework AM_LDFLAGS = -F/System/Library/Frameworks/PCSC.framework -L/opt/local/lib
endif endif
pkcs11dir = ${includedir}/pkcs11 pkcs11dir = ${includedir}/pkcs11

@ -3,10 +3,15 @@
## 1 2 3 4 5 6 7 8 ## 1 2 3 4 5 6 7 8
## 45678901234567890123456789012345678901234567890123456789012345678901234567890 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
AM_CXXFLAGS += -I ${top_srcdir}/src AM_CXXFLAGS = -I ${top_srcdir}/src
AM_LDFLAGS = -L${top_builddir}/src AM_LDFLAGS = -L${top_builddir}/src
LDADD = -lcppunit LDADD = -lcppunit
if MAC
AM_LDFLAGS += -L/opt/local/lib
AM_CPPFLAGS += -I/opt/local/include
endif
check_PROGRAMS = sharedpointer_test check_PROGRAMS = sharedpointer_test
TESTS=${check_PROGRAMS} TESTS=${check_PROGRAMS}

Loading…
Cancel
Save