Changeset 66ae396


Ignore:
Timestamp:
May 16, 2013 2:59:02 PM (6 years ago)
Author:
Mei <mei@…>
Branches:
abac0-leak, abac0-mei, master, mei-id, mei-rt0-n, mei_rt0, tvf-new-xml
Children:
11e4486
Parents:
709677a
Message:

1) fix that missing LD flag for python
2) add some missing file into Makefile.am so make dist can pick them up

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    r0d6b61a r66ae396  
    33bin_PROGRAMS = libabac/abac_prover libabac/abac_prover_plus \
    44               creddy/creddy
    5 BUILT_SOURCES  = swig/python/ABAC.py swig/perl/ABAC.pm swig/python/abac_wrap.cxx swig/perl/abac_wrap.cxx
     5BUILT_SOURCES  = swig/python/ABAC.py swig/perl/ABAC.pm swig/python/abac_wrap.cxx swig/perl/abac_wrap.cxx
     6EXTRA_DIST = doc/API doc/ChangeLog doc/creddy.1 doc/dependencies doc/design doc/INSTALL doc/java_install doc/keystore doc/role_names doc/usage_scenario doc/creddy.1
    67
    78libabac_libabac_la_SOURCES = \
     
    3435libabac_libabac_la_LIBADD = $(XML2_LDFLAGS) $(XMLSEC1_LDFLAGS) $(OPENSSL_LIBS)
    3536
    36 libabac_abac_prover_SOURCES = libabac/prover.c libabac/options.c libabac/abac.h
     37libabac_abac_prover_SOURCES = libabac/prover.c libabac/options.c libabac/options.h libabac/abac.h
    3738libabac_abac_prover_LDADD = $(top_builddir)/libabac/libabac.la
    3839
    39 libabac_abac_prover_plus_SOURCES = libabac/prover_plus.cc libabac/options.c libabac/abac.hh
     40libabac_abac_prover_plus_SOURCES = libabac/prover_plus.cc libabac/options.c libabac/options.h libabac/abac.hh
    4041libabac_abac_prover_plus_LDADD = $(top_builddir)/libabac/libabac.la
    4142
    4243# creddy
    4344creddy_creddy_SOURCES = \
     45    creddy/creddy_common.h \
    4446    creddy/attribute.c \
    4547    creddy/attribute_rule.c \
     
    6567#
    6668bin_SCRIPTS = swig/python/abac_prover.py
    67 #swig/python/abac_keyid.py swig/python/abac_attr.py
    6869python_PYTHON = swig/python/ABAC.py
    6970pyexec_LTLIBRARIES = swig/python/_ABAC.la
    7071
    7172# ABAC
    72 swig_python__ABAC_la_SOURCES = swig/python/abac_wrap.cxx swig/python/ABAC.py
     73swig_python__ABAC_la_SOURCES = swig/python/abac_wrap.cxx swig/python/ABAC.py swig/python/chunk.i swig/python/language.i swig/python/abac_prover.py
    7374swig_python__ABAC_la_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS)
    7475swig_python__ABAC_la_LDFLAGS = -module
     
    8384#
    8485bin_SCRIPTS += swig/perl/abac_prover.pl
    85 #swig/perl/creddy_keyid.pl
    8686perldir = @SITE_PERL@
    8787perl_SCRIPTS = swig/perl/ABAC.pm
     
    8989
    9090# ABAC
    91 swig_perl_ABAC_la_SOURCES = swig/perl/abac_wrap.cxx swig/perl/SSL_keyid.c swig/perl/ABAC.pm
     91swig_perl_ABAC_la_SOURCES = swig/perl/abac_wrap.cxx swig/perl/SSL_keyid.c swig/perl/SSL_keyid.h  swig/perl/ABAC.pm swig/perl/chunk.i swig/perl/language.i swig/perl/abac_prover.pl
    9292swig_perl_ABAC_la_CPPFLAGS = `perl -MExtUtils::Embed -e ccopts`
    9393swig_perl_ABAC_la_LDFLAGS = -module
     
    9898        $(SWIG) -perl -o swig/perl/abac_wrap.cxx swig/perl/abac.i
    9999
    100 
    101100# preprove
    102 bin_SCRIPTS += preprover/abac_preprover_client.pl preprover/abac_preprover_server.pl
     101#bin_SCRIPTS += preprover/abac_preprover_client.pl preprover/abac_preprover_server.pl
    103102
    104103# misc
  • doc/INSTALL

    rc00fcc3 r66ae396  
    33BUILDING LIBABAC
    44
    5 $ ./autogen.sh
    65$ ./configure
    76$ make && sudo make install
  • doc/java_install

    rc0bdce8 r66ae396  
    1414    all: clean then compile and make docs
    1515    compile: build the library and test programs
    16     run-test: run a simple test program in GraphTest.java (params in target)
    17     run-dump: run a program to dump a certificate in ASN1 (params in target)
     16    regression-test: run a set of regression test programs
    1817    jar: build jabac.jar in build/jar/jabac.jar
    1918    doc: greate API javadocs in ./doc
  • java/build.xml

    rfd92625 r66ae396  
    66    all: clean then compile and make docs
    77    compile: build the library and test programs
    8     run-test: run a simple test program in GraphTest.java (params in target)
    9     run-dump: run a program to dump a certificate in ASN1 (params in target)
     8    regression-test: run a set of regression test programs
    109    jar: build jabac.jar in build/jar/jabac.jar
    1110    doc: greate API javadocs in ./doc
  • m4/ax_python_devel.m4

    r46a2dc3 r66ae396  
    267267           PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
    268268                conf = distutils.sysconfig.get_config_var; \
    269                 print (conf('LOCALMODLIBS') + ' ' + conf('LIBS'))"`
     269                print (conf('LOCALMODLIBS') + ' ' + conf('LIBS') + ' ' + conf('LIBM'));"`
    270270        fi
    271271        AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
Note: See TracChangeset for help on using the changeset viewer.