File ARToolKit-2.72.1-shared.patch of Package ARToolKit_v4l
diff -rupN ARToolKit/lib/SRC/AR/Makefile.in ARToolKit_mod/lib/SRC/AR/Makefile.in
--- ARToolKit/lib/SRC/AR/Makefile.in 2004-11-04 09:51:27.000000000 +0100
+++ ARToolKit_mod/lib/SRC/AR/Makefile.in 2010-05-18 10:53:58.389419828 +0200
@@ -7,17 +7,15 @@ LIB_DIR = ../..
# compiler
#
CC= cc
-CFLAG= @CFLAG@ -I$(INC_DIR)
-#
-# For making the library
-#
-AR= ar
-ARFLAGS= @ARFLAG@
-RANLIB= @RANLIB@
+CFLAG= @CFLAG@ -I$(INC_DIR) -fPIC
+LDFLAGS = -lm
#
# products
#
-LIB= ${LIB_DIR}/libAR.a
+LIBNAME = libAR.so
+MAJOR = 2
+MINOR = 72.1
+LIB= ${LIB_DIR}/${LIBNAME}.${MAJOR}.${MINOR}
INCLUDE1= ${INC_DIR}/AR/config.h \
${INC_DIR}/AR/matrix.h
INCLUDE2= ${INC_DIR}/AR/param.h
@@ -25,54 +23,53 @@ INCLUDE3= ${INC_DIR}/AR/ar.h
#
# compilation control
#
-LIBOBJS1= ${LIB}(mAlloc.o) ${LIB}(mFree.o) \
- ${LIB}(mAllocDup.o) ${LIB}(mDup.o) \
- ${LIB}(mAllocTrans.o) ${LIB}(mTrans.o) \
- ${LIB}(mAllocMul.o) ${LIB}(mMul.o) \
- ${LIB}(mAllocInv.o) ${LIB}(mInv.o) ${LIB}(mSelfInv.o) \
- ${LIB}(mAllocUnit.o) ${LIB}(mUnit.o) \
- ${LIB}(mDisp.o) ${LIB}(mDet.o) \
- ${LIB}(mPCA.o) \
- ${LIB}(vAlloc.o) ${LIB}(vDisp.o) \
- ${LIB}(vFree.o) ${LIB}(vHouse.o) \
- ${LIB}(vInnerP.o) ${LIB}(vTridiag.o)
-
-LIBOBJS2= ${LIB}(paramGet.o) \
- ${LIB}(paramDecomp.o) \
- ${LIB}(paramDistortion.o) \
- ${LIB}(paramChangeSize.o) \
- ${LIB}(paramFile.o) \
- ${LIB}(paramDisp.o)
-
-LIBOBJS3= ${LIB}(arDetectMarker.o) \
- ${LIB}(arGetTransMat.o) \
- ${LIB}(arGetTransMat2.o) \
- ${LIB}(arGetTransMat3.o) \
- ${LIB}(arGetTransMatCont.o) \
- ${LIB}(arLabeling.o) \
- ${LIB}(arDetectMarker2.o) \
- ${LIB}(arGetMarkerInfo.o) \
- ${LIB}(arGetCode.o) \
- ${LIB}(arUtil.o)
+LIBOBJS1= mAlloc.o mFree.o \
+ mAllocDup.o mDup.o \
+ mAllocTrans.o mTrans.o \
+ mAllocMul.o mMul.o \
+ mAllocInv.o mInv.o mSelfInv.o \
+ mAllocUnit.o mUnit.o \
+ mDisp.o mDet.o \
+ mPCA.o \
+ vAlloc.o vDisp.o \
+ vFree.o vHouse.o \
+ vInnerP.o vTridiag.o
+
+LIBOBJS2= paramGet.o \
+ paramDecomp.o \
+ paramDistortion.o \
+ paramChangeSize.o \
+ paramFile.o \
+ paramDisp.o
+
+LIBOBJS3= arDetectMarker.o \
+ arGetTransMat.o \
+ arGetTransMat2.o \
+ arGetTransMat3.o \
+ arGetTransMatCont.o \
+ arLabeling.o \
+ arDetectMarker2.o \
+ arGetMarkerInfo.o \
+ arGetCode.o \
+ arUtil.o
-all: ${LIBOBJS1} ${LIBOBJS2} ${LIBOBJS3}
+all: ${LIB}
${LIBOBJS1}: ${INCLUDE1}
${LIBOBJS2}: ${INCLUDE1} ${INCLUDE2}
${LIBOBJS3}: ${INCLUDE1} ${INCLUDE2} ${INCLUDE3}
-.c.a:
+${LIBOBJS1} ${LIBOBJS2} ${LIBOBJS3}: %.o: %.c
${CC} -c ${CFLAG} $<
- ${AR} ${ARFLAGS} $@ $*.o
- ${RANLIB}
- rm -f $*.o
+
+${LIB}: ${LIBOBJS1} ${LIBOBJS2} ${LIBOBJS3}
+ ${CC} $^ -o $@ -shared -Wl,-soname,${LIBNAME}.${MAJOR} ${LDFLAGS}
+ ln -s ${LIBNAME}.${MAJOR}.${MINOR} ${LIB_DIR}/${LIBNAME}.${MAJOR}
+ ln -s ${LIBNAME}.${MAJOR} ${LIB_DIR}/${LIBNAME}
clean:
- rm -f *.o
- rm -f ${LIB}
+ rm -f *.o ${LIB_DIR}/${LIBNAME}*
-allclean:
- rm -f *.o
- rm -f ${LIB}
+allclean: clean
rm -f Makefile
diff -rupN ARToolKit/lib/SRC/ARMulti/Makefile.in ARToolKit_mod/lib/SRC/ARMulti/Makefile.in
--- ARToolKit/lib/SRC/ARMulti/Makefile.in 2004-11-04 09:51:34.000000000 +0100
+++ ARToolKit_mod/lib/SRC/ARMulti/Makefile.in 2010-05-18 11:22:32.258170574 +0200
@@ -7,17 +7,15 @@ LIB_DIR = ../..
# compiler
#
CC= cc
-CFLAG= @CFLAG@ -I$(INC_DIR)
-#
-# For making the library
-#
-AR= ar
-ARFLAGS= @ARFLAG@
-RANLIB= @RANLIB@
+CFLAG= @CFLAG@ -I$(INC_DIR) -fPIC
+LDFLAGS = -L../.. -lAR
#
# products
#
-LIB= ${LIB_DIR}/libARMulti.a
+LIBNAME = libARMulti.so
+MAJOR = 2
+MINOR = 72.1
+LIB= ${LIB_DIR}/${LIBNAME}.${MAJOR}.${MINOR}
INCLUDE= ${INC_DIR}/AR/config.h \
${INC_DIR}/AR/matrix.h \
${INC_DIR}/AR/param.h \
@@ -26,26 +24,25 @@ INCLUDE= ${INC_DIR}/AR/config.h \
#
# compilation control
#
-LIBOBJS= ${LIB}(arMultiReadConfigFile.o) \
- ${LIB}(arMultiGetTransMat.o) \
- ${LIB}(arMultiActivate.o)
+LIBOBJS= arMultiReadConfigFile.o \
+ arMultiGetTransMat.o \
+ arMultiActivate.o
-all: ${LIBOBJS}
+all: ${LIB}
${LIBOBJS}: ${INCLUDE}
-.c.a:
+${LIBOBJS}: %.o: %.c
${CC} -c ${CFLAG} $<
- ${AR} ${ARFLAGS} $@ $*.o
- ${RANLIB}
- rm -f $*.o
+
+${LIB}: ${LIBOBJS}
+ ${CC} $^ -o $@ -shared -Wl,-soname,${LIBNAME}.${MAJOR} ${LDFLAGS}
+ ln -s ${LIBNAME}.${MAJOR}.${MINOR} ${LIB_DIR}/${LIBNAME}.${MAJOR}
+ ln -s ${LIBNAME}.${MAJOR} ${LIB_DIR}/${LIBNAME}
clean:
- rm -f *.o
- rm -f ${LIB}
+ rm -f *.o ${LIB_DIR}/${LIBNAME}*
-allclean:
- rm -f *.o
- rm -f ${LIB}
+allclean: clean
rm -f Makefile
diff -rupN ARToolKit/lib/SRC/ARvrml/Makefile.in ARToolKit_mod/lib/SRC/ARvrml/Makefile.in
--- ARToolKit/lib/SRC/ARvrml/Makefile.in 2004-11-19 04:26:52.000000000 +0100
+++ ARToolKit_mod/lib/SRC/ARvrml/Makefile.in 2010-05-18 10:53:00.473170476 +0200
@@ -10,13 +10,13 @@ endif
VRML_CPPFLAGS = -I$(VRML_HOME)/include/openvrml -I/usr/X11R6/include
CPPFLAGS = $(AR_CPPFLAGS) $(VRML_CPPFLAGS)
-CFLAGS = @CFLAG@
+CFLAGS = @CFLAG@ -fPIC
CXXFLAGS = @CFLAG@
-AR = ar
-ARFLAGS = @ARFLAG@
-RANLIB = @RANLIB@
-TARGET = $(AR_HOME)/lib/libARvrml.a
+LIBNAME = libARvrml.so
+MAJOR = 2
+MINOR = 72.1
+TARGET = $(AR_HOME)/lib/${LIBNAME}.${MAJOR}.${MINOR}
HEADERS = \
$(AR_HOME)/include/AR/arvrml.h \
@@ -35,14 +35,12 @@ default build all: $(TARGET)
$(OBJS): $(HEADERS)
$(TARGET): $(OBJS)
- $(AR) $(ARFLAGS) $@ $^
- $(RANLIB) $@
+ ${CC} $^ -o $@ -shared -Wl,-soname,${LIBNAME}.${MAJOR}
+ ln -s ${LIBNAME}.${MAJOR}.${MINOR} ${LIB_DIR}/${LIBNAME}.${MAJOR}
+ ln -s ${LIBNAME}.${MAJOR} ${LIB_DIR}/${LIBNAME}
clean:
- -rm -f *.o *~ *.bak
- -rm $(TARGET)
+ rm -f *.o *~ *.bak $(AR_HOME)/lib/${LIBNAME}*
-allclean:
- -rm -f *.o *~ *.bak
- -rm $(TARGET)
- -rm -f Makefile
+allclean: clean
+ rm -f Makefile
diff -rupN ARToolKit/lib/SRC/Gl/Makefile.in ARToolKit_mod/lib/SRC/Gl/Makefile.in
--- ARToolKit/lib/SRC/Gl/Makefile.in 2004-11-19 04:37:34.000000000 +0100
+++ ARToolKit_mod/lib/SRC/Gl/Makefile.in 2010-05-18 11:15:33.584419859 +0200
@@ -7,27 +7,29 @@ LIB_DIR = ../..
# compiler
#
CC= cc
-CFLAG= @CFLAG@ -I$(INC_DIR)
-#
-# For making the library
-#
-AR= ar
-ARFLAGS= @ARFLAG@
-RANLIB= @RANLIB@
+CFLAG= @CFLAG@ -I$(INC_DIR) -fPIC
+LDFLAGS1 = -L../.. -lAR $(shell pkg-config glu --libs) -lglut
+LDFLAGS2 = -L../.. -lAR -lARvideo -lARgsub $(shell pkg-config glu --libs) -lglut
+LDFLAGS3 = -L../.. -lAR $(shell pkg-config glu --libs)
#
# products
#
-LIB= ${LIB_DIR}/libARgsub.a
-LIB2= ${LIB_DIR}/libARgsubUtil.a
-LIB3= ${LIB_DIR}/libARgsub_lite.a
+LIBNAME1 = libARgsub.so
+LIBNAME2 = libARgsubUtil.so
+LIBNAME3 = libARgsub_lite.so
+MAJOR = 2
+MINOR = 72.1
+LIB1= ${LIB_DIR}/${LIBNAME1}.${MAJOR}.${MINOR}
+LIB2= ${LIB_DIR}/${LIBNAME2}.${MAJOR}.${MINOR}
+LIB3= ${LIB_DIR}/${LIBNAME3}.${MAJOR}.${MINOR}
-INCLUDE= ${INC_DIR}/AR/gsub.h \
+INCLUDE1=${INC_DIR}/AR/gsub.h \
${INC_DIR}/AR/config.h \
${INC_DIR}/AR/ar.h \
${INC_DIR}/AR/matrix.h \
${INC_DIR}/AR/param.h
-INCLUDE2= ${INC_DIR}/AR/gsubUtil.h
-INCLUDE3= ${INC_DIR}/AR/gsub_lite.h \
+INCLUDE2=${INC_DIR}/AR/gsubUtil.h
+INCLUDE3=${INC_DIR}/AR/gsub_lite.h \
${INC_DIR}/AR/config.h \
${INC_DIR}/AR/ar.h \
${INC_DIR}/AR/param.h
@@ -35,27 +37,36 @@ INCLUDE3= ${INC_DIR}/AR/gsub_lite.h \
#
# compilation control
#
-LIBOBJS= ${LIB}(gsub.o)
-LIB2OBJS= ${LIB2}(gsubUtil.o)
-LIB3OBJS= ${LIB3}(gsub_lite.o)
+LIB1OBJS= gsub.o
+LIB2OBJS= gsubUtil.o
+LIB3OBJS= gsub_lite.o
-all: ${LIBOBJS} ${LIB2OBJS} ${LIB3OBJS}
+all: ${LIB1} ${LIB2} ${LIB3}
-${LIBOBJS}: ${INCLUDE}
-${LIB2OBJS}: ${INCLUDE} ${INCLUDE2}
+${LIB1OBJS}: ${INCLUDE1}
+${LIB2OBJS}: ${INCLUDE1} ${INCLUDE2}
${LIB3OBJS}: ${INCLUDE3}
-.c.a:
+${LIB1OBJS} ${LIB2OBJS} ${LIB3OBJS}: %.o: %.c
${CC} -c ${CFLAG} $<
- ${AR} ${ARFLAGS} $@ $*.o
- ${RANLIB}
- rm -f $*.o
+
+${LIB1}: ${LIB1OBJS}
+ ${CC} $^ -o $@ -shared -Wl,-soname,${LIBNAME1}.${MAJOR} ${LDFLAGS1}
+ ln -s ${LIBNAME1}.${MAJOR}.${MINOR} ${LIB_DIR}/${LIBNAME1}.${MAJOR}
+ ln -s ${LIBNAME1}.${MAJOR} ${LIB_DIR}/${LIBNAME1}
+
+${LIB2}: ${LIB2OBJS}
+ ${CC} $^ -o $@ -shared -Wl,-soname,${LIBNAME2}.${MAJOR} ${LDFLAGS2}
+ ln -s ${LIBNAME2}.${MAJOR}.${MINOR} ${LIB_DIR}/${LIBNAME2}.${MAJOR}
+ ln -s ${LIBNAME2}.${MAJOR} ${LIB_DIR}/${LIBNAME2}
+
+${LIB3}: ${LIB3OBJS}
+ ${CC} $^ -o $@ -shared -Wl,-soname,${LIBNAME3}.${MAJOR} ${LDFLAGS3}
+ ln -s ${LIBNAME3}.${MAJOR}.${MINOR} ${LIB_DIR}/${LIBNAME3}.${MAJOR}
+ ln -s ${LIBNAME3}.${MAJOR} ${LIB_DIR}/${LIBNAME3}
clean:
- rm -f *.o
- rm -f ${LIB} ${LIB2} ${LIB3}
+ rm -f *.o ${LIB_DIR}/${LIBNAME1}* ${LIB_DIR}/${LIBNAME2}* ${LIB_DIR}/${LIBNAME3}*
-allclean:
- rm -f *.o
- rm -f ${LIB} ${LIB2} ${LIB3}
+allclean: clean
rm -f Makefile
diff -rupN ARToolKit/lib/SRC/Makefile.in ARToolKit_mod/lib/SRC/Makefile.in
--- ARToolKit/lib/SRC/Makefile.in 2006-07-10 06:35:17.000000000 +0200
+++ ARToolKit_mod/lib/SRC/Makefile.in 2010-05-18 11:16:14.727420847 +0200
@@ -3,8 +3,8 @@ VIDEO_DRIVER=@VIDEO_DRIVER@
all:
(cd AR; make -f Makefile)
(cd ARMulti; make -f Makefile)
- (cd Gl; make -f Makefile)
(cd @VIDEO_DRIVER@; make -f Makefile)
+ (cd Gl; make -f Makefile)
clean:
(cd AR; make -f Makefile clean)
diff -rupN ARToolKit/lib/SRC/VideoGStreamer/Makefile.in ARToolKit_mod/lib/SRC/VideoGStreamer/Makefile.in
--- ARToolKit/lib/SRC/VideoGStreamer/Makefile.in 2006-07-10 06:35:17.000000000 +0200
+++ ARToolKit_mod/lib/SRC/VideoGStreamer/Makefile.in 2010-05-18 11:02:51.556420807 +0200
@@ -7,36 +7,36 @@ LIB_DIR = ../..
# compiler
#
CC=cc
-CFLAG= @CFLAG@ -I$(INC_DIR)
-#
-# For making the library
-#
-AR= ar
-ARFLAGS= @ARFLAG@
+CFLAG= @CFLAG@ -I$(INC_DIR) -fPIC
+LDFLAGS = $(shell pkg-config gstreamer-0.10 --libs)
#
# products
#
-LIB= ${LIB_DIR}/libARvideo.a
+LIBNAME = libARvideo.so
+MAJOR = 2
+MINOR = 72.1
+LIB= ${LIB_DIR}/${LIBNAME}.${MAJOR}.${MINOR}
INCLUDE= ${INC_DIR}/AR/video.h
#
# compilation control
#
-LIBOBJS= ${LIB}(video.o)
+LIBOBJS= video.o
-all: ${LIBOBJS}
+all: ${LIB}
${LIBOBJS}: ${INCLUDE}
-.c.a:
+${LIBOBJS}: %.o: %.c
${CC} -c ${CFLAG} $<
- ${AR} ${ARFLAGS} $@ $*.o
- rm -f $*.o
+
+${LIB}: ${LIBOBJS}
+ ${CC} $^ -o $@ -shared -Wl,-soname,${LIBNAME}.${MAJOR} ${LDFLAGS}
+ ln -s ${LIBNAME}.${MAJOR}.${MINOR} ${LIB_DIR}/${LIBNAME}.${MAJOR}
+ ln -s ${LIBNAME}.${MAJOR} ${LIB_DIR}/${LIBNAME}
+
clean:
- rm -f *.o
- rm -f ${LIB}
+ rm -f *.o ${LIB_DIR}/${LIBNAME}*
-allclean:
- rm -f *.o
- rm -f ${LIB}
+allclean: clean
rm -f Makefile
diff -rupN ARToolKit/lib/SRC/VideoLinuxV4L/Makefile.in ARToolKit_mod/lib/SRC/VideoLinuxV4L/Makefile.in
--- ARToolKit/lib/SRC/VideoLinuxV4L/Makefile.in 2006-12-06 01:37:23.000000000 +0100
+++ ARToolKit_mod/lib/SRC/VideoLinuxV4L/Makefile.in 2010-05-18 10:53:00.474170377 +0200
@@ -7,44 +7,39 @@ LIB_DIR = ../..
# compiler
#
CC= cc
-CFLAG= @CFLAG@ -I$(INC_DIR)
-#
-# For making the library
-#
-AR= ar
-ARFLAGS= @ARFLAG@
+CFLAG= @CFLAG@ -I$(INC_DIR) -fPIC
#
# products
#
-LIB= ${LIB_DIR}/libARvideo.a
+LIBNAME = libARvideo.so
+MAJOR = 2
+MINOR = 72.1
+LIB= ${LIB_DIR}/${LIBNAME}.${MAJOR}.${MINOR}
INCLUDE= ${INC_DIR}/AR/video.h
#
# compilation control
#
# LIBOBJS= ${LIB}(video.o) ${LIB}(ccvt_i386.o)
-LIBOBJS= ${LIB}(@CCVT_OBJ@) ${LIB}(video.o)
+LIBOBJS= @CCVT_OBJ@ video.o
-all: ${LIBOBJS}
+all: ${LIB}
${LIBOBJS}: ${INCLUDE}
-.c.a:
+ccvt_c.o video.o: %.o: %.c
${CC} -c ${CFLAG} $<
- ${AR} ${ARFLAGS} $@ $*.o
- rm -f $*.o
-.S.a:
- ${CC} -c ${CFLAG} $<
- ${AR} ${ARFLAGS} $@ $*.o
- rm -f $*.o
+ccvt_i386.o: %.o: %.S
+ ${CC} -c ${CFLAG} -I/usr/src/linux/include/ -I/usr/src/linux/arch/x86/include/ $<
+${LIB}: ${LIBOBJS}
+ ${CC} $^ -o $@ -shared -Wl,-soname,${LIBNAME}.${MAJOR}
+ ln -s ${LIBNAME}.${MAJOR}.${MINOR} ${LIB_DIR}/${LIBNAME}.${MAJOR}
+ ln -s ${LIBNAME}.${MAJOR} ${LIB_DIR}/${LIBNAME}
clean:
- rm -f *.o
- rm -f ${LIB}
+ rm -f *.o ${LIB_DIR}/${LIBNAME}*
-allclean:
- rm -f *.o
- rm -f ${LIB}
+allclean: clean
rm -f Makefile
