Introduced AAIP code. Now linking with libacl.

master
Thomas Schmitt 14 years ago
parent 2fdd8738ef
commit c4ced566b1
  1. 4
      Makefile.am
  2. 5
      xorriso/compile_xorriso.sh
  3. 8
      xorriso/xorriso_makefile_am.txt
  4. 2
      xorriso/xorriso_timestamp.h

@ -47,7 +47,9 @@ bin_PROGRAMS = \
xorriso_xorriso_CPPFLAGS = -Ilibisoburn
xorriso_xorriso_CFLAGS = -DXorriso_with_maiN $(READLINE_DEF)
xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn $(THREAD_LIBS)
xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn \
$(THREAD_LIBS) -lacl
xorriso_xorriso_SOURCES = \
xorriso/xorriso.h \
xorriso/xorriso_private.h \

@ -84,7 +84,7 @@ libisofs="$libisofs $isofs"/util_htable.o
libisofs="$libisofs $isofs"/util_rbtree.o
libisofs="$libisofs $isofs"/system_area.o
libisofs="$libisofs $isofs"/make_isohybrid_mbr.o
libisofs="$libisofs $isofs"/aaip_0_2.o
echo "Version timestamp : $(sed -e 's/#define Xorriso_timestamP "//' -e 's/"$//' "$xorr"/xorriso_timestamp.h)"
@ -141,7 +141,8 @@ cc -I. -DXorriso_with_maiN $def_libreadline \
\
$link_libreadline \
\
-lpthread
-lpthread \
-lacl
ret=$?
if test "$ret" = 0

@ -18,7 +18,7 @@ xorriso_xorriso_CPPFLAGS = -I./libburn -I./libisofs -I./libisoburn -I./xorriso
# are in a separate readline-development package.
xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN $(READLINE_DEF)
xorriso_xorriso_LDADD = $(THREAD_LIBS)
xorriso_xorriso_LDADD = $(THREAD_LIBS) -lacl
# This looks quite ugly with make install: xorriso.c is compiled twice again
@ -99,6 +99,8 @@ xorriso_xorriso_SOURCES = \
libisofs/system_area.h \
libisofs/system_area.c \
libisofs/make_isohybrid_mbr.c \
libisofs/aaip_0_2.h \
libisofs/aaip_0_2.c \
\
libburn/async.c \
libburn/async.h \
@ -225,6 +227,8 @@ EXTRA_DIST = \
INSTALL \
xorriso/changelog.txt \
xorriso/xorriso_buildstamp_none.h \
$(man_MANS)
$(man_MANS) \
libisofs/aaip-os-linux.c \
libisofs/aaip-os-freebsd.c

@ -1 +1 @@
#define Xorriso_timestamP "2009.01.10.154018"
#define Xorriso_timestamP "2009.01.14.110935"

Loading…
Cancel
Save