[Phission-cvs] phission Makefile.am,1.22,1.23
Brought to you by:
pthoren
Menu
▾
▴
[Phission-cvs] phission Makefile.am,1.22,1.23
|
From: Philip T. <pt...@us...> - 2006-04-05 00:25:54
|
Update of /cvsroot/phission/phission In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3676 Modified Files: Makefile.am Log Message: There is now only one Makefile.am; Removed all the other Makefile.am files and integrated it into this one. Index: Makefile.am =================================================================== RCS file: /cvsroot/phission/phission/Makefile.am,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Makefile.am 6 Jan 2006 22:31:52 -0000 1.22 --- Makefile.am 4 Apr 2006 23:27:05 -0000 1.23 *************** *** 1,49 **** #--------------------------------------------------------------------------- ! if PH_USE_VISIONCLASSES ! phvisiondir=vision endif #--------------------------------------------------------------------------- ! SUBDIRS= base \ ! capture \ ! display \ ! filter $(phvisiondir) #--------------------------------------------------------------------------- packagedir = @PACKAGE_DIR@ ! nobase_package_DATA = docs/html/*.html \ ! docs/html/*.css \ ! docs/pyro/*.html \ ! docs/pyro/images/*.gif \ ! docs/pyro/images/*.jpg \ ! docs/pyro/images/*.jpeg #--------------------------------------------------------------------------- # The files will be installed without the removal of examples/cpp examplecppdir = @PACKAGE_DIR@/ ! nobase_examplecpp_SCRIPTS=examples/cpp/*/*.sh \ ! examples/cpp/runexamples.sh ! nobase_examplecpp_DATA=examples/cpp/Makefile \ ! examples/cpp/Makefile.example \ ! examples/cpp/*/Makefile \ ! examples/cpp/*/src/*.c* \ ! examples/cpp/*/include/*.h* \ ! examples/cpp/images.tar.bz2 #--------------------------------------------------------------------------- headerdir = @PACKAGE_DIR@/include ! header_DATA = config/phission.h \ ! phissionconfig.h #--------------------------------------------------------------------------- bindir=@prefix@/bin ! bin_SCRIPTS = config/phission-config #--------------------------------------------------------------------------- packbindir=@PACKAGE_DIR@/bin ! packbin_SCRIPTS = libtool \ ! config/ltmain.sh \ ! config/install-sh #--------------------------------------------------------------------------- --- 1,471 ---- #--------------------------------------------------------------------------- ! phission_headersdir = @PHISSION_INCLUDE_DIR@ ! phission_headers_HEADERS = ! ! lib_LTLIBRARIES = libphission.la ! ! libphission_la_SOURCES = ! libphission_la_CXXFLAGS = ! libphission_la_CFLAGS = ! libphission_la_LDFLAGS =-release $(LT_RELEASE) \ ! -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ ! @LPC_LDFLAGS@ ! libphission_la_LIBADD = ! libphission_la_DEPENDENCIES = ! ! #--------------------------------------------------------------------------- ! # base/ ! #--------------------------------------------------------------------------- ! BASE_SRCDIR = $(top_srcdir)/base/src ! BASE_INCDIR = $(top_srcdir)/base/include ! BASE_INCLUDES = -I$(BASE_INCDIR) ! ! if PH_USE_NET ! libbase_netheaders=$(BASE_INCDIR)/phServerSocket.h \ ! $(BASE_INCDIR)/phSocket.h ! ! libbase_netsources= $(BASE_SRCDIR)/phServerSocket.cpp \ ! $(BASE_SRCDIR)/phSocket.cpp ! else ! libbase_netheaders= ! libbase_netsources= ! endif ! ! if PH_USE_LIBJPEG ! libbase_jpegsources=$(BASE_SRCDIR)/ImageJPEG.c ! libbase_jpegheaders=$(BASE_INCDIR)/ImageJPEG.h ! else ! libbase_jpegsources= ! libbase_jpegheaders= endif + base_target_sources= $(BASE_SRCDIR)/phInt32Array.cpp \ + $(BASE_SRCDIR)/phQuicksort.cpp \ + $(BASE_SRCDIR)/ImageConversions.c \ + $(BASE_SRCDIR)/ImageDefinitions.c \ + $(BASE_SRCDIR)/ImageGfx.c \ + $(libbase_jpegsources) $(BASE_SRCDIR)/ImagePPM.c \ + $(BASE_SRCDIR)/ImageUtil.c \ + $(BASE_SRCDIR)/phbase.c \ + $(BASE_SRCDIR)/phArgTable.cpp \ + $(BASE_SRCDIR)/phCaptureInterface.cpp \ + $(BASE_SRCDIR)/phImageCapture.cpp \ + $(BASE_SRCDIR)/phCondition.cpp \ + $(BASE_SRCDIR)/phConditionCounter.cpp \ + $(BASE_SRCDIR)/phDataObject.cpp \ + $(BASE_SRCDIR)/phImageWindow.cpp \ + $(BASE_SRCDIR)/phDisplayInterface.cpp \ + $(BASE_SRCDIR)/phFilter.cpp \ + $(BASE_SRCDIR)/phImage.cpp \ + $(BASE_SRCDIR)/phList.cpp \ + $(BASE_SRCDIR)/phLiveObject.cpp \ + $(BASE_SRCDIR)/phMutex.cpp $(libbase_netsources) \ + $(BASE_SRCDIR)/phObject.cpp \ + $(BASE_SRCDIR)/phObjectList.cpp \ + $(BASE_SRCDIR)/phPipeline.cpp \ + $(BASE_SRCDIR)/phRWLock.cpp \ + $(BASE_SRCDIR)/phSemaphore.cpp \ + $(BASE_SRCDIR)/phSystem.cpp \ + $(BASE_SRCDIR)/phThread.cpp \ + $(BASE_SRCDIR)/phTime.cpp \ + $(BASE_SRCDIR)/phTimeInterval.cpp \ + $(BASE_SRCDIR)/phTimeList.cpp \ + $(BASE_SRCDIR)/phTimeStamp.cpp + + base_target_headers= $(BASE_INCDIR)/phInt32Array.h \ + $(BASE_INCDIR)/phQuicksort.h \ + $(BASE_INCDIR)/ImageConversions.h \ + $(BASE_INCDIR)/ImageDefinitions.h \ + $(BASE_INCDIR)/ImageGfx.h \ + $(libbase_jpegheaders) $(BASE_INCDIR)/ImagePPM.h \ + $(BASE_INCDIR)/ImageUtil.h \ + $(BASE_INCDIR)/phbase.h \ + $(BASE_INCDIR)/phByteOrder.h \ + $(BASE_INCDIR)/phArgTable.h \ + $(BASE_INCDIR)/phCaptureInterface.h \ + $(BASE_INCDIR)/phImageCapture.h \ + $(BASE_INCDIR)/phCondition.h \ + $(BASE_INCDIR)/phConditionCounter.h \ + $(BASE_INCDIR)/phDataObject.h \ + $(BASE_INCDIR)/phImageWindow.h \ + $(BASE_INCDIR)/phDisplayInterface.h \ + $(BASE_INCDIR)/phFilter.h \ + $(BASE_INCDIR)/phImage.h \ + $(BASE_INCDIR)/phList.h \ + $(BASE_INCDIR)/phLiveObject.h \ + $(BASE_INCDIR)/phMutex.h $(libbase_netheaders) \ + $(BASE_INCDIR)/phObject.h \ + $(BASE_INCDIR)/phObjectList.h \ + $(BASE_INCDIR)/phPipeline.h \ + $(BASE_INCDIR)/phRWLock.h \ + $(BASE_INCDIR)/phSemaphore.h \ + $(BASE_INCDIR)/phStdint.h \ + $(BASE_INCDIR)/phSystem.h \ + $(BASE_INCDIR)/phThread.h \ + $(BASE_INCDIR)/phTime.h \ + $(BASE_INCDIR)/phTimeInterval.h \ + $(BASE_INCDIR)/phTimeList.h \ + $(BASE_INCDIR)/phTimeStamp.h + + libphission_la_CXXFLAGS += $(BASE_INCLUDES) + libphission_la_CFLAGS += $(libbase_la_CXXFLAGS) + libphission_la_SOURCES += $(base_target_sources) + libphission_la_DEPENDENCIES += $(base_target_headers) + + phission_headers_HEADERS += $(base_target_headers) + #--------------------------------------------------------------------------- ! # capture/v4l/ ! #--------------------------------------------------------------------------- ! if PH_USE_V4L ! CAP_V4L_SRCDIR = $(top_srcdir)/capture/v4l/src ! CAP_V4L_INCDIR = $(top_srcdir)/capture/v4l/include ! capture_v4l_target_sources = $(CAP_V4L_SRCDIR)/V4LCapture.cpp ! ! CAP_V4L_INCLUDES = -I$(CAP_V4L_INCDIR) \ ! -I$(BASE_INCDIR) ! ! libphission_la_CXXFLAGS += $(CAP_V4L_INCLUDES) ! libphission_la_CFLAGS += $(libv4lcapture_la_CXXFLAGS) ! libphission_la_SOURCES += $(capture_v4l_target_sources) ! libphission_la_DEPENDENCIES += $(CAP_V4L_INCDIR)/V4LCapture.h ! ! phission_headers_HEADERS += $(CAP_V4L_INCDIR)/*.h ! endif ! ! #--------------------------------------------------------------------------- ! # capture/vfw/ ! #--------------------------------------------------------------------------- ! if PH_USE_VFW ! CAP_VFW_SRCDIR = $(top_srcdir)/capture/vfw/src ! CAP_VFW_INCDIR = $(top_srcdir)/capture/vfw/include ! capture_vfw_target_sources = $(CAP_VFW_SRCDIR)/VFWSource.cpp ! ! CAP_VFW_INCLUDES = -I$(CAP_VFW_INCDIR) \ ! -I$(BASE_INCDIR) ! ! libphission_la_CXXFLAGS += $(CAP_VFW_INCLUDES) ! libphission_la_CFLAGS += $(libvfwsource_la_CXXFLAGS) ! libphission_la_SOURCES += $(capture_vfw_target_sources) ! libphission_la_DEPENDENCIES += $(CAP_VFW_INCDIR)/VFWSource.h ! ! phission_headers_HEADERS += $(CAP_VFW_INCDIR)/*.h ! endif ! ! #--------------------------------------------------------------------------- ! # capture/avcodec/ ! #--------------------------------------------------------------------------- ! if PH_USE_AVCODEC ! CAP_AVCODEC_SRCDIR = $(top_srcdir)/capture/avcodec/src ! CAP_AVCODEC_INCDIR = $(top_srcdir)/capture/avcodec/include ! capture_avcodec_target_sources = $(CAP_AVCODEC_SRCDIR)/phAvcodecSource.cpp ! ! CAP_AVCODEC_INCLUDES = -I$(CAP_AVCODEC_INCDIR) \ ! -I$(BASE_INCDIR) ! libphission_la_CXXFLAGS += $(CAP_AVCODEC_INCLUDES) ! libphission_la_CFLAGS += $(libphavcodecsource_la_CXXFLAGS) ! libphission_la_SOURCES += $(capture_avcodec_target_sources) ! libphission_la_DEPENDENCIES += $(CAP_AVCODEC_INCDIR)/phAvcodecSource.h ! ! phission_headers_HEADERS += $(CAP_AVCODEC_INCDIR)/*.h ! endif ! ! #--------------------------------------------------------------------------- ! # capture/net/ ! #--------------------------------------------------------------------------- ! if PH_USE_NET ! CAP_NET_SRCDIR = $(top_srcdir)/capture/net/src ! CAP_NET_INCDIR = $(top_srcdir)/capture/net/include ! capture_net_target_sources = $(CAP_NET_SRCDIR)/phNetSource.cpp ! ! CAP_NET_INCLUDES = -I$(CAP_NET_INCDIR) \ ! -I$(BASE_INCDIR) ! ! libphission_la_CXXFLAGS += $(CAP_NET_INCLUDES) ! libphission_la_CFLAGS += $(libphnetsource_la_CXXFLAGS) ! libphission_la_SOURCES += $(capture_net_target_sources) ! libphission_la_DEPENDENCIES += $(CAP_NET_INCDIR)/phNetSource.h ! ! phission_headers_HEADERS += $(CAP_NET_INCDIR)/*.h ! endif ! ! #--------------------------------------------------------------------------- ! # display/gdi/ ! #--------------------------------------------------------------------------- ! if PH_USE_GDI ! DISP_GDI_SRCDIR = $(top_srcdir)/display/GDI/src ! DISP_GDI_INCDIR = $(top_srcdir)/display/GDI/include ! display_gdi_target_sources = $(DISP_GDI_SRCDIR)/phGDIImageWindow.cpp \ ! $(DISP_GDI_SRCDIR)/GDIDisplay.cpp ! ! DISPLAY_GDI_INCLUDES = -I$(DISP_GDI_INCDIR) \ ! -I$(BASE_INCDIR) ! ! libphission_la_CXXFLAGS += $(DISPLAY_GDI_INCLUDES) ! libphission_la_CFLAGS += $(DISPLAY_GDI_INCLUDES) ! libphission_la_SOURCES += $(display_gdi_target_sources) ! libphission_la_DEPENDENCIES += $(DISP_GDI_INCDIR)/GDIDisplay.h \ ! $(DISP_GDI_INCDIR)/phGDIImageWindow.h ! ! phission_headers_HEADERS +=$(DISP_GDI_INCDIR)/*.h ! endif ! ! #--------------------------------------------------------------------------- ! # display/x11/ ! #--------------------------------------------------------------------------- ! if PH_USE_X11 ! DISP_X11_SRCDIR = $(top_srcdir)/display/X11/src ! DISP_X11_INCDIR = $(top_srcdir)/display/X11/include ! display_x11_target_sources = $(DISP_X11_SRCDIR)/phX11Util.cpp \ ! $(DISP_X11_SRCDIR)/phX11ImageWindow.cpp \ ! $(DISP_X11_SRCDIR)/X11Display.cpp ! DISPLAY_X11_INCLUDES = -I$(DISP_X11_INCDIR) \ ! -I$(BASE_INCDIR) ! ! display_x11_tmpCFLAGS = $(DISPLAY_X11_INCLUDES) ! libphission_la_CXXFLAGS += $(display_x11_tmpCFLAGS) ! libphission_la_CFLAGS += $(display_x11_tmpCFLAGS) ! libphission_la_SOURCES += $(display_x11_target_sources) ! libphission_la_DEPENDENCIES += $(DISP_X11_INCDIR)/X11Display.h \ ! $(DISP_X11_INCDIR)/phX11ImageWindow.h \ ! $(DISP_X11_INCDIR)/phX11Util.h ! ! phission_headers_HEADERS +=$(DISP_X11_INCDIR)/*.h ! endif ! ! #--------------------------------------------------------------------------- ! # display/fltk/ ! #--------------------------------------------------------------------------- ! if PH_USE_FLTK ! DISP_FLTK_SRCDIR = $(top_srcdir)/display/fltk/src ! DISP_FLTK_INCDIR = $(top_srcdir)/display/fltk/include ! display_fltk_target_sources = $(DISP_FLTK_SRCDIR)/FLDisplay.cpp \ ! $(DISP_FLTK_SRCDIR)/phFLImageWindow.cpp ! ! DISPLAY_FLTK_INCLUDES = -I$(DISP_FLTK_INCDIR) \ ! -I$(BASE_INCDIR) ! ! display_fltk_tmpCFLAGS = $(DISPLAY_FLTK_INCLUDES) ! libphission_la_CXXFLAGS += $(display_fltk_tmpCFLAGS) `fltk-config --cxxflags` ! libphission_la_CFLAGS += $(display_fltk_tmpCFLAGS) `fltk-config --cflags` ! libphission_la_SOURCES += $(display_fltk_target_sources) ! libphission_la_DEPENDENCIES += $(DISP_FLTK_INCDIR)/phFLImageWindow.h \ ! $(DISP_FLTK_INCDIR)/FLDisplay.h ! ! phission_headers_HEADERS +=$(DISP_FLTK_INCDIR)/*.h ! endif ! ! #--------------------------------------------------------------------------- ! # display/sdl/ ! #--------------------------------------------------------------------------- ! if PH_USE_SDL ! DISP_SDL_SRCDIR = $(top_srcdir)/display/sdl/src ! DISP_SDL_INCDIR = $(top_srcdir)/display/sdl/include ! display_sdl_target_sources = $(DISP_SDL_SRCDIR)/phSDLImageWindow.cpp \ ! $(DISP_SDL_SRCDIR)/SDLDisplay.cpp ! DISPLAY_SDL_INCLUDES = -I$(DISP_SDL_INCDIR) \ ! -I$(BASE_INCDIR) ! ! display_sdl_tmpCFLAGS = $(DISPLAY_SDL_INCLUDES) ! libphission_la_CXXFLAGS += $(display_sdl_tmpCFLAGS) `sdl-config --cflags` ! libphission_la_CFLAGS += $(display_sdl_tmpCFLAGS) `sdl-config --cflags` ! libphission_la_SOURCES += $(display_sdl_target_sources) ! libphission_la_DEPENDENCIES += $(DISP_SDL_INCDIR)/phSDLImageWindow.h \ ! $(DISP_SDL_INCDIR)/SDLDisplay.h ! ! phission_headers_HEADERS +=$(DISP_SDL_INCDIR)/*.h ! endif ! ! #--------------------------------------------------------------------------- ! # display/net/ ! #--------------------------------------------------------------------------- ! if PH_USE_NET ! DISP_NET_SRCDIR = $(top_srcdir)/display/net/src ! DISP_NET_INCDIR = $(top_srcdir)/display/net/include ! display_net_target_sources = $(DISP_NET_SRCDIR)/phNetClientThread.cpp \ ! $(DISP_NET_SRCDIR)/phNetImageWindow.cpp \ ! $(DISP_NET_SRCDIR)/NetDisplay.cpp ! DISPLAY_NET_INCLUDES = -I$(DISP_NET_INCDIR) \ ! -I$(BASE_INCDIR) ! ! display_net_tmpCFLAGS = $(DISPLAY_NET_INCLUDES) ! libphission_la_CXXFLAGS += $(display_net_tmpCFLAGS) ! libphission_la_CFLAGS += $(display_net_tmpCFLAGS) ! libphission_la_SOURCES += $(display_net_target_sources) ! libphission_la_DEPENDENCIES += $(DISP_NET_INCDIR)/phNetClientThread.h \ ! $(DISP_NET_INCDIR)/phNetImageWindow.h \ ! $(DISP_NET_INCDIR)/NetDisplay.h ! ! phission_headers_HEADERS +=$(DISP_NET_INCDIR)/*.h ! endif ! ! #------------------------------------------------------------------------------ ! # filter/video/ : The Phission filters ! #--------------------------------------------------------------------------- ! if PH_USE_PYTHON ! tempPYTHON_INCLUDES= @PYTHON_INCLUDES@ ! else ! tempPYTHON_INCLUDES= ! endif ! ! FILTER_VIDEO_DIR = $(top_srcdir)/filter ! FILTER_VIDEO_SRCDIR = $(FILTER_VIDEO_DIR)/video/src ! FILTER_VIDEO_INCDIR = $(FILTER_VIDEO_DIR)/video/include ! ! FILTER_VIDEO_INCLUDES = -I$(FILTER_VIDEO_INCDIR) \ ! -I$(BASE_INCDIR) ! ! if PH_USE_OPENCV ! opencvfilter_src = $(FILTER_VIDEO_SRCDIR)/cv_canny_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/cv_empty_Filter.cpp ! opencvfilter_hdrs= $(FILTER_VIDEO_INCDIR)/cv_canny_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/cv_empty_Filter.h ! else ! opencvfilter_src = ! opencvfilter_hdrs= ! endif ! filter_video_target_sources = $(FILTER_VIDEO_SRCDIR)/add_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/average_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/phblob.c \ ! $(FILTER_VIDEO_SRCDIR)/phBlobData.cpp \ ! $(FILTER_VIDEO_SRCDIR)/blob_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/blobify_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/brightness_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/canny_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/convert_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/drawRect_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/empty_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/gaussian3x3_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/gaussianBlur_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/grayScale_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/phHistogramData.cpp \ ! $(FILTER_VIDEO_SRCDIR)/histogram_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/hsvthreshold_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/inverse_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/mask_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/match_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/meanBlur_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/meanNxN_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/medianBlur_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/medianNxN_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/motion_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/original_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/resize_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/scale_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/setPlane_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/sobel3x3_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/sobel_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/subtract_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/superRGB_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/swapPlanes_Filter.cpp \ ! $(FILTER_VIDEO_SRCDIR)/threshold_Filter.cpp $(opencvfilter_src) \ ! $(FILTER_VIDEO_SRCDIR)/ddimage_Filter.cpp ! ! filter_video_target_headers= $(FILTER_VIDEO_INCDIR)/add_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/average_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/phblob.h \ ! $(FILTER_VIDEO_INCDIR)/phBlobData.h \ ! $(FILTER_VIDEO_INCDIR)/blob_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/blobify_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/brightness_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/canny_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/convert_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/drawRect_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/empty_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/gaussian3x3_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/gaussianBlur_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/grayScale_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/phHistogramData.h \ ! $(FILTER_VIDEO_INCDIR)/histogram_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/hsvthreshold_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/inverse_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/match_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/mask_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/meanBlur_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/meanNxN_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/medianBlur_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/medianNxN_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/motion_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/original_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/resize_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/scale_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/setPlane_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/sobel3x3_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/sobel_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/subtract_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/superRGB_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/swapPlanes_Filter.h \ ! $(FILTER_VIDEO_INCDIR)/threshold_Filter.h $(opencvfilter_hdrs) \ ! $(FILTER_VIDEO_INCDIR)/ddimage_Filter.h ! ! ! libphission_la_CXXFLAGS += $(FILTER_VIDEO_INCLUDES) ! libphission_la_CFLAGS += $(FILTER_VIDEO_INCLUDES) ! libphission_la_SOURCES += $(filter_video_target_sources) ! libphission_la_DEPENDENCIES += $(filter_video_target_headers) ! ! phission_headers_HEADERS += $(filter_video_target_headers) ! ! #--------------------------------------------------------------------------- ! # vision/ : The phSimpleVision class ! #---------------------------------------------------------------------------- ! if PH_USE_VISIONCLASSES ! VISION_SRCDIR = $(top_srcdir)/vision/src ! VISION_INCDIR = $(top_srcdir)/vision/include ! vision_target_sources = $(VISION_SRCDIR)/phSimpleVision.cpp ! ! VISION_INCLUDES = -I$(top_srcdir)/vision/include \ ! -I$(top_srcdir)/base/include \ ! -I$(top_srcdir)/capture/v4l/include \ ! -I$(top_srcdir)/capture/vfw/include \ ! -I$(top_srcdir)/display/X11/include \ ! -I$(top_srcdir)/display/GDI/include \ ! -I$(top_srcdir)/display/net/include \ ! -I$(top_srcdir)/filter/video/include ! ! libphission_la_CXXFLAGS += $(VISION_INCLUDES) ! libphission_la_CFLAGS += $(libvisionclasses_la_CXXFLAGS) ! libphission_la_SOURCES += ${vision_target_sources} ! libphission_la_DEPENDENCIES += $(VISION_INCDIR)/phSimpleVision.h ! ! phission_headers_HEADERS += $(VISION_INCDIR)/*.h ! endif #--------------------------------------------------------------------------- packagedir = @PACKAGE_DIR@ ! nobase_package_DATA = $(top_srcdir)/docs/html/*.html \ ! $(top_srcdir)/docs/html/*.css \ ! $(top_srcdir)/docs/pyro/*.html \ ! $(top_srcdir)/docs/pyro/images/*.gif \ ! $(top_srcdir)/docs/pyro/images/*.jpg \ ! $(top_srcdir)/docs/pyro/images/*.jpeg #--------------------------------------------------------------------------- # The files will be installed without the removal of examples/cpp examplecppdir = @PACKAGE_DIR@/ ! nobase_examplecpp_SCRIPTS=$(top_srcdir)/examples/cpp/*/*.sh \ ! $(top_srcdir)/examples/cpp/runexamples.sh ! nobase_examplecpp_DATA=$(top_srcdir)/examples/cpp/Makefile \ ! $(top_srcdir)/examples/cpp/Makefile.example \ ! $(top_srcdir)/examples/cpp/*/Makefile \ ! $(top_srcdir)/examples/cpp/*/src/*.c* \ ! $(top_srcdir)/examples/cpp/*/include/*.h* \ ! $(top_srcdir)/examples/cpp/images.tar.bz2 #--------------------------------------------------------------------------- headerdir = @PACKAGE_DIR@/include ! header_DATA = $(top_srcdir)/config/phission.h \ ! $(top_srcdir)/phissionconfig.h #--------------------------------------------------------------------------- bindir=@prefix@/bin ! bin_SCRIPTS = $(top_srcdir)/config/phission-config #--------------------------------------------------------------------------- packbindir=@PACKAGE_DIR@/bin ! packbin_SCRIPTS = $(top_srcdir)/libtool \ ! $(top_srcdir)/config/ltmain.sh \ ! $(top_srcdir)/config/install-sh #--------------------------------------------------------------------------- *************** *** 51,58 **** swigdir=@PACKAGE_DIR@ if PH_USE_PYTHON ! SWIG_PY_FILES = swig/phission_py.i endif if PH_USE_JAVA ! SWIG_JAVA_FILES = swig/phission_java.i swig/phission_java_custom.i endif nobase_swig_DATA = ${SWIG_PY_FILES} ${SWIG_JAVA_FILES} --- 473,480 ---- swigdir=@PACKAGE_DIR@ if PH_USE_PYTHON ! SWIG_PY_FILES = $(top_srcdir)/swig/phission_py.i endif if PH_USE_JAVA ! SWIG_JAVA_FILES = $(top_srcdir)/swig/phission_java.i $(top_srcdir)/swig/phission_java_custom.i endif nobase_swig_DATA = ${SWIG_PY_FILES} ${SWIG_JAVA_FILES} *************** *** 61,83 **** #--------------------------------------------------------------------------- # The other *lib dependencies are declared and added in configure.in ! baselib = $(top_srcdir)/base/libbase.la ! filtervideolib = $(top_srcdir)/filter/video/libfiltervideo.la ! ! #--------------------------------------------------------------------------- ! lib_LTLIBRARIES = libphission.la ! ! #libphission_la_dir = @PACKAGE_DIR@/lib ! libphission_la_SOURCES = ! libphission_la_LDFLAGS =-release $(LT_RELEASE) \ ! -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ! libphission_la_LDFLAGS += @LPC_LDFLAGS@ ! libphission_la_LIBADD = $(baselib) @LPC_LIBADD@ $(filtervideolib) ! libphission_la_DEPENDENCIES = $(baselib) @LPC_LIBADD@ $(filtervideolib) ! #------------------------------------------------------------------------------ - #------------------------------------------------------------------------------ .PRECIOUS:java/%.java.c %.cc python/%.cc %.lo %.oxx %.o objs/%.oxx %._oxx objs/%._oxx objs/%.o # Include all the include dirs; No need to pick and choose directories VPATH =./swig:./config:./src:./include:./objs:./python:\ --- 483,493 ---- #--------------------------------------------------------------------------- # The other *lib dependencies are declared and added in configure.in ! #baselib = $(top_srcdir)/libbase.la ! #filtervideolib = $(top_srcdir)/libfiltervideo.la #------------------------------------------------------------------------------ .PRECIOUS:java/%.java.c %.cc python/%.cc %.lo %.oxx %.o objs/%.oxx %._oxx objs/%._oxx objs/%.o + #------------------------------------------------------------------------------ # Include all the include dirs; No need to pick and choose directories VPATH =./swig:./config:./src:./include:./objs:./python:\ *************** *** 96,99 **** --- 506,510 ---- ${top_srcdir}/vision/include: + #------------------------------------------------------------------------------ SWIG_INCLUDES:= -I$(top_srcdir)/ \ -I$(top_srcdir)/base/include \ *************** *** 125,148 **** if PH_USE_SWIG ! @INCLUDE_SWIG@ if PH_USE_PYTHON # if we can use SWIG and PYTHON than the Pyro brains will be installed brainsdir = @PACKAGE_DIR@/ ! nobase_brains_DATA=examples/pyro/brains/*.py \ ! examples/pyro/*.py \ ! examples/*.py ! nobase_brains_SCRIPTS=examples/pyro/brains/*.sh endif if PH_USE_PYTHON ! @INCLUDE_SWIG_PYTHON@ python_modulesdir = @PYTHON_MODULE_DIR@ ! python_modules_DATA = ./swig/__init__.py @PYTHON_INSTALL_VARS@ python_extradir = @PACKAGE_DIR@ ! python_extra_DATA = ./__init__.py all-local:: swig-python --- 536,559 ---- if PH_USE_SWIG ! include ${top_srcdir}/Makefile.swig if PH_USE_PYTHON # if we can use SWIG and PYTHON than the Pyro brains will be installed brainsdir = @PACKAGE_DIR@/ ! nobase_brains_DATA=$(top_srcdir)/examples/pyro/brains/*.py \ ! $(top_srcdir)/examples/pyro/*.py \ ! $(top_srcdir)/examples/*.py ! nobase_brains_SCRIPTS=$(top_srcdir)/examples/pyro/brains/*.sh endif if PH_USE_PYTHON ! include ${top_srcdir}/Makefile.swig-python python_modulesdir = @PYTHON_MODULE_DIR@ ! python_modules_DATA = $(top_srcdir)/swig/__init__.py @PYTHON_INSTALL_VARS@ python_extradir = @PACKAGE_DIR@ ! python_extra_DATA = $(top_srcdir)/__init__.py all-local:: swig-python *************** *** 156,167 **** if PH_USE_JAVA javaexamplesdir= @PACKAGE_DIR@/ ! nobase_javaexamples_DATA=examples/java/*/src/*.java \ ! examples/java/*/Makefile ! nobase_javaexamples_SCRIPTS=examples/java/*/*.sh endif if PH_USE_JAVA ! @INCLUDE_SWIG_JAVA@ java_jardir = @JAVA_MODULE_DIR@ --- 567,578 ---- if PH_USE_JAVA javaexamplesdir= @PACKAGE_DIR@/ ! nobase_javaexamples_DATA=$(top_srcdir)/examples/java/*/src/*.java \ ! $(top_srcdir)/examples/java/*/Makefile ! nobase_javaexamples_SCRIPTS=$(top_srcdir)/examples/java/*/*.sh endif if PH_USE_JAVA ! include ${top_srcdir}/Makefile.swig-java java_jardir = @JAVA_MODULE_DIR@ |