[Digikam-devel] extragear/graphics/digikam/utilities

[Gilles Caulier]

SVN commit 610979 by cgilles:

digikam from trunk : and improve again --enable-final .configure option. Now all digikam 
folders are compiled using this rule.

To packagers : let's me hear if you have some problems with this change.

CCMAIL: digikam-devel at kde.org



 M  +20 -20    cameragui/Makefile.am  
 M  +17 -18    setup/Makefile.am  


--- trunk/extragear/graphics/digikam/utilities/cameragui/Makefile.am #610978:610979
@@ -1,30 +1,30 @@
-# Require by libgphoto2 header.
-KDE_OPTIONS = nofinal
-
 METASOURCES = AUTO
 
 noinst_LTLIBRARIES = libcameragui.la
 
-libcameragui_la_SOURCES = cameraui.cpp cameraiconview.cpp  \
-	                      cameraiconitem.cpp cameracontroller.cpp \
-	                      camerafolderview.cpp camerafolderitem.cpp \
-	                      animwidget.cpp renamecustomizer.cpp  \
-	                      dkcamera.cpp gpcamera.cpp umscamera.cpp \
-	                      gpiteminfo.cpp camerainfodialog.cpp \
-	                      albumselectdialog.cpp camerafolderdialog.cpp 
+# NOTE from Gilles (06-12-06): gpcamera.cpp must be placed on the top of source file list 
+# to unbreak compilation with './configure -enable-final' option. I suspect a problem with 
+# Gphoto2 C Ansi header.
+libcameragui_la_SOURCES = gpcamera.cpp cameraui.cpp cameraiconview.cpp  \
+	                  cameraiconitem.cpp cameracontroller.cpp \
+	                  camerafolderview.cpp camerafolderitem.cpp \
+	                  animwidget.cpp renamecustomizer.cpp  \
+	                  dkcamera.cpp umscamera.cpp gpiteminfo.cpp \
+	                  camerainfodialog.cpp albumselectdialog.cpp \
+	                  camerafolderdialog.cpp  
 
 libcameragui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
 libcameragui_la_LIBADD  = $(top_builddir)/digikam/libs/imageproperties/libimagepropertiescamgui.la \
-	                      $(LIB_GPHOTO) $(LIBJPEG)
+	                  $(LIB_GPHOTO) $(LIBJPEG)
 
 INCLUDES = -I$(top_srcdir)/digikam/digikam \
-	       -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
-	       -I$(top_srcdir)/digikam/libs/jpegutils \
-	       -I$(top_srcdir)/digikam/libs/themeengine \
-	       -I$(top_srcdir)/digikam/libs/imageproperties \
-	       -I$(top_srcdir)/digikam/libs/widgets/common \
-	       -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/libs/dmetadata \
-	       -I$(top_srcdir)/digikam/libs/dcraw \
-	       $(GPHOTO_CFLAGS) $(all_includes)
+	   -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
+	   -I$(top_srcdir)/digikam/libs/jpegutils \
+	   -I$(top_srcdir)/digikam/libs/themeengine \
+	   -I$(top_srcdir)/digikam/libs/imageproperties \
+	   -I$(top_srcdir)/digikam/libs/widgets/common \
+	   -I$(top_srcdir)/digikam/libs/dimg \
+	   -I$(top_srcdir)/digikam/libs/dmetadata \
+	   -I$(top_srcdir)/digikam/libs/dcraw \
+	   $(GPHOTO_CFLAGS) $(all_includes)
--- trunk/extragear/graphics/digikam/utilities/setup/Makefile.am #610978:610979
@@ -1,30 +1,29 @@
-# Require by libgphoto2 header.
-KDE_OPTIONS = nofinal
-
 METASOURCES = AUTO
 
-INCLUDES= -I$(top_srcdir)/digikam/digikam \
-	      -I$(top_srcdir)/digikam/libs/dialogs \
-	      -I$(top_srcdir)/digikam/libs/dimg \
-	      -I$(top_srcdir)/digikam/libs/dcraw \
-	      -I$(top_srcdir)/digikam/libs/widgets/common \
-	      $(GPHOTO_CFLAGS) $(LIBKIPI_CFLAGS) \
-	      $(all_includes)
+INCLUDES = -I$(top_srcdir)/digikam/digikam \
+	   -I$(top_srcdir)/digikam/libs/dialogs \
+	   -I$(top_srcdir)/digikam/libs/dimg \
+	   -I$(top_srcdir)/digikam/libs/dcraw \
+	   -I$(top_srcdir)/digikam/libs/widgets/common \
+	   $(GPHOTO_CFLAGS) $(LIBKIPI_CFLAGS) $(all_includes)
 
 noinst_LTLIBRARIES = libsetup.la libshowfotosetup.la
 
-libsetup_la_SOURCES = setup.cpp setupcamera.cpp setupimgplugins.cpp \
-	                  cameraselection.cpp setupgeneral.cpp \
-	                  gpiface.cpp setupmime.cpp setupplugins.cpp \
-	                  setupcollections.cpp setupmetadata.cpp \
-	                  setupeditor.cpp setupmisc.cpp setupicc.cpp \
-	                  setupiofiles.cpp setupslideshow.cpp setupidentity.cpp \
-	                  setuptooltip.cpp dcrawsettingswidget.cpp 
+# NOTE from Gilles (06-12-06): gpiface.cpp must be placed on the top of source file list 
+# to unbreak compilation with './configure -enable-final' option. I suspect a problem with 
+# Gphoto2 C Ansi header.
+libsetup_la_SOURCES = gpiface.cpp cameraselection.cpp setupcamera.cpp \
+	              setupmime.cpp setupplugins.cpp setupidentity.cpp \
+	              setupgeneral.cpp setup.cpp setupimgplugins.cpp \
+	              setupcollections.cpp setupmetadata.cpp \
+	              setupeditor.cpp setupmisc.cpp setupicc.cpp \
+	              setupiofiles.cpp setupslideshow.cpp \
+	              setuptooltip.cpp dcrawsettingswidget.cpp 
 
 libsetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_GPHOTO)
 
 libshowfotosetup_la_SOURCES = setupimgplugins.cpp setupiofiles.cpp \
-	                          setupicc.cpp setupslideshow.cpp dcrawsettingswidget.cpp 
+	                      setupicc.cpp setupslideshow.cpp dcrawsettingswidget.cpp 
 
 libshowfotosetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)