[Avidemux-svn-commit] r3463 - branches/avidemux_2.4_branch/avidemux

[mean at BerliOS]

Author: mean
Date: 2007-07-31 08:41:52 +0200 (Tue, 31 Jul 2007)
New Revision: 3463

Modified:
   branches/avidemux_2.4_branch/avidemux/Makefile.am
Log:
[Automake] update for split ocr/gtk

Modified: branches/avidemux_2.4_branch/avidemux/Makefile.am
===================================================================
--- branches/avidemux_2.4_branch/avidemux/Makefile.am	2007-07-31 06:24:44 UTC (rev 3462)
+++ branches/avidemux_2.4_branch/avidemux/Makefile.am	2007-07-31 06:41:52 UTC (rev 3463)
@@ -22,7 +22,8 @@
 endif
 
 user_interface_gtk = \
-		./ADM_ocr/libADM_ocr.a					\
+		./ADM_toolkit/libADM_toolkit.a				\
+		./ADM_ocr/libADM_ocr.a	\
 		./ADM_userInterfaces/ADM_commonUI/libmergedCommonUI.o  \
 		./ADM_userInterfaces/ADM_GTK/ADM_ocr/libADM_ocrGtk.a	\
 		./ADM_userInterfaces/ADM_GTK/ADM_filters/libADM_filtersGtk.a \
@@ -32,15 +33,18 @@
 		./ADM_userInterfaces/ADM_GTK/ADM_toolkit_gtk/libADM_toolkit_gtk.a	 
 		
 user_interface_cli = \
+		./ADM_ocr/libADM_ocr.a	\
 		./ADM_userInterfaces/ADM_NONE/ADM_gui2/libADM_gui2.a	\
 		./ADM_userInterfaces/ADM_NONE/ADM_dialog/libADM_dialog.a	\
 		./ADM_userInterfaces/ADM_NONE/ADM_dialogFactory/libADM_dialogFactory.a	\
 		./ADM_userInterfaces/ADM_commonUI/libADM_CommonUI.a	\
 		./ADM_userInterfaces/ADM_NONE/ADM_gui2/libADM_gui2.a	\
-		./ADM_userInterfaces/ADM_NONE/ADM_filters/libADM_filters.a 
+		./ADM_userInterfaces/ADM_NONE/ADM_filters/libADM_filters.a \ 
+		./ADM_toolkit/libADM_toolkit.a				
 		
 		
 user_interface_qt4 = \
+			./ADM_ocr/libADM_ocr.a	\
 			./ADM_userInterfaces/ADM_QT4/ADM_gui/libADM_gui2.a	\
 			./ADM_userInterfaces/ADM_QT4/ADM_dialog/libADM_dialog.a	\
 			./ADM_userInterfaces/ADM_QT4/ADM_dialog/AQ_srt.o	\
@@ -48,7 +52,8 @@
 			./ADM_userInterfaces/ADM_commonUI/libADM_CommonUI.a	\
 			./ADM_userInterfaces/ADM_QT4/ADM_dialogFactory/libADM_dialogFactory.a	\
 			./ADM_userInterfaces/ADM_QT4/ADM_gui/libADM_gui2.a	\
-			./ADM_userInterfaces/ADM_QT4/ADM_filters/libADM_filters.a 
+			./ADM_userInterfaces/ADM_QT4/ADM_filters/libADM_filters.a \
+			./ADM_toolkit/libADM_toolkit.a				
 
 adm_src =   guiplay.cpp  \
 	gui_savenew.cpp  gui_navigate.cpp gtk_gui.cpp   \
@@ -100,7 +105,6 @@
 ./ADM_video/libADM_video.a				\
 ./ADM_colorspace/libADM_colorspace.a			\
 ./ADM_audiodevice/libADM_audiodevice.a			\
-./ADM_ocr/libADM_ocr.a					\
 ./ADM_outputs/oplug_mp4/liboplug_mp4.a			\
 ./ADM_outputs/oplug_mpeg/liboplug_mpeg.a		\
 ./ADM_outputs/oplug_mpegFF/liboplug_mpegFF.a		\
@@ -137,11 +141,9 @@
 ./ADM_libraries/ADM_xvidratectl/libADM_xvidratectl.a
 
 adm_postlib= \
-./ADM_toolkit/libADM_toolkit.a				\
 ./ADM_libraries/ADM_utilities/libADM_library.a		\
 ./ADM_osSupport/libADM_ossupport.a			\
 ./ADM_libraries/ADM_libswscale/libswscale.a		\
-./ADM_ocr/libADM_ocr.a					\
 $(libmpeg2enc_Altivec) \
 $(win32_icon)