[Digikam-devel] extragear/graphics/digikam/libs/lprof

[Gilles Caulier]

SVN commit 497620 by cgilles:

digikam from trunk : liblprof : finding a solution to resolve compilation using KDE rules. All files are renamed from .c to .cpp. All C++ compilation errors have been fixed. Makefile.am have been fixed accordinly.

This way compile fine in Mandriva. Let's me hear if Debian, RH, Suse are right

CCMAIL: digikam-devel at kde.org,  Laurent Montel <montel at kde.org>


 M  +5 -9      Makefile.am  
 D             cmshull.c  
 A             cmshull.cpp   cmshull.c#497584
 D             cmslm.c  
 A             cmslm.cpp   cmslm.c#497584
 D             cmslnr.c  
 A             cmslnr.cpp   cmslnr.c#497584
 D             cmsmatn.c  
 A             cmsmatn.cpp   cmsmatn.c#497584
 D             cmsmkmsh.c  
 A             cmsmkmsh.cpp   cmsmkmsh.c#497584
 D             cmsmntr.c  
 A             cmsmntr.cpp   cmsmntr.c#497584
 D             cmsoutl.c  
 A             cmsoutl.cpp   cmsoutl.c#497584
 D             cmspcoll.c  
 A             cmspcoll.cpp   cmspcoll.c#497584 [License: GPL (v2+) (wrong address) GENERATED FILE]
 D             cmsprf.c  
 A             cmsprf.cpp   cmsprf.c#497584 [License: LGPL (v2+) (wrong address)]
 D             cmsreg.c  
 A             cmsreg.cpp   cmsreg.c#497584
 D             cmsscn.c  
 A             cmsscn.cpp   cmsscn.c#497584
 D             cmssheet.c  
 A             cmssheet.cpp   cmssheet.c#497584 [License: GPL (v2+) (wrong address) GENERATED FILE] [UTF-8 ENCODING PROBLEMS]
 M  +2 -4      lcmsprf.h  


--- trunk/extragear/graphics/digikam/libs/lprof/Makefile.am #497619:497620
@@ -1,14 +1,10 @@
 noinst_LTLIBRARIES = liblprof.la
 
-# FIXME: i using CFLAGS to disable all main compilation options and using "-fomit-frame-pointer" option instead,
-# else we cannot compile these files. The problem is relevant of using '-std=iso9899:1990' compilation option by default.
-# How to disable only this option here ? (12/01/06-Gilles Caulier <caulier dot gilles at free dot fr>)
-#KDE_CFLAGS = -fomit-frame-pointer
-CFLAGS = -fomit-frame-pointer
-
 noinst_HEADERS = lcmsprf.h
 
-liblprof_la_SOURCES = cmshull.c cmslm.c cmslnr.c cmsmatn.c cmsmkmsh.c cmsmntr.c cmsoutl.c \
-	                  cmspcoll.c cmsprf.c cmsreg.c cmsscn.c cmssheet.c
+liblprof_la_CXXFLAGS = -w -fomit-frame-pointer 
 
-INCLUDES = $(all_includes)
+liblprof_la_SOURCES = cmshull.cpp cmslm.cpp cmslnr.cpp cmsmatn.cpp cmsmkmsh.cpp cmsmntr.cpp cmsoutl.cpp \
+	                  cmspcoll.cpp cmsprf.cpp cmsreg.cpp cmsscn.cpp cmssheet.cpp
+
+#INCLUDES = $(all_includes)
--- trunk/extragear/graphics/digikam/libs/lprof/lcmsprf.h #497619:497620
@@ -35,18 +35,16 @@
 
 /* Version 1.09a */
 
-#include <config.h>
-
 #ifndef __cmsprf_H
 
+#include <config.h>
 #include LCMS_HEADER
-/*#include "lcms.h"*/
+
 #include <ctype.h>
 #include <limits.h>
 #include <stdarg.h>
 #include <sys/stat.h>
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif