[patch] oyranos-0.9.3-buildsystem.patch

oyranos-0.9.3-buildsystem.patch (text/plain), 3.31 KB, created by Chris Reffett (RETIRED) on 2013-01-06 16:28:36 UTC

--- oyranos-0.9.3/src/examples/oforms/oyranos_xforms.makefile
+++ oyranos-0.9.3/src/examples/oforms/oyranos_xforms.makefile
@@ -1,8 +1,8 @@
-INCL    = $(INCLUDE) -I../ -I./ $(DEBUG)
-CC      = gcc
-DEBUG  = -Wall -g -O0
+INCL    = $(INCLUDE) -I../ -I./
+CC      ?= gcc
+CXX     ?= c++
 LDFLAGS_ = $$LDFLAGS -L../fl_i18n
-OY_LIBS := $(shell pkg-config oyranos libxml-2.0 --libs --cflags)
+OY_LIBS := $(shell pkg-config libxml-2.0 --libs --cflags) ../liboyranos.so ../liboyranos_object.so ../liboyranos_core.so ../liboyranos_config.so ../liboyranos_modules.so
 OY_FLAGS = -L../ $(OY_LIBS)
 FLTK_FLAGS := $(shell fltk-config --ldflags --cxxflags | sed s/-O2//) -lpthread
 
@@ -15,15 +15,15 @@
 
 oyranos-xforms:	$(SRCDIR)oyranos_xforms.c
 	echo "Compiling $(SRCDIR)$< + Linking $@ ..."
-	gcc -Wall -g $(CFLAGS) $(INCL)  $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS_)
+	$(CC) -Wall $(CFLAGS) $(LDFLAGS) $(INCL)  $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS_)
 
 oyranos-xforms-modules:	$(SRCDIR)oyranos_xforms_modules.c
 	echo "Compiling $(SRCDIR)$< + Linking $@ ..."
-	gcc -Wall -g $(CFLAGS) $(INCL)  $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS_)
+	$(CC) -Wall $(CFLAGS) $(LDFLAGS) $(INCL)  $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS_)
 
 oyranos-xforms-fltk:	$(SRCDIR)oyranos_xforms_fltk.cxx $(SRCDIR)oyranos_forms_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.h
 	echo "Compiling $(SRCDIR)$< + Linking $@ ..."
-	-c++ $(LDFLAGS_) -Wall -g $(CXXFLAGS) $(INCL)  $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS)
+	$(CXX) $(LDFLAGS_) -Wall $(CXXFLAGS) $(LDFLAGS) $(INCL)  $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS)
 
 
 # Build commands and filename extensions...
--- oyranos-0.9.3/extras/oyranos-config.in
+++ oyranos-0.9.3/extras/oyranos-config.in
@@ -109,7 +109,7 @@
 
 if [ "$echo_ldflags" = "yes" ]; then
   if [ -f liboyranos.so ]; then
-    echo "-L. -loyranos -loyranos_config -loyranos_modules -loyranos_object -loyranos_core $elektra $oyranos_add"
+    echo "lliboyranos.so liboyranos_config.so liboyranos_modules.so liboyranos_object.so liboyranos_core.so $elektra $oyranos_add"
   else
     echo "-L$libdir -loyranos -loyranos_config -loyranos_modules -loyranos_object -loyranos_core $elektra $oyranos_add"

diff -ruN oyranos-0.9.3/src/CMakeLists.txt oyranos-0.9.3-patched/src/CMakeLists.txt
--- oyranos-0.9.3/src/CMakeLists.txt	2013-01-05 04:30:29.000000000 -0500
+++ oyranos-0.9.3-patched/src/CMakeLists.txt	2013-01-06 10:48:43.325671969 -0500
@@ -194,8 +194,9 @@
 ADD_SUBDIRECTORY( liboyranos )
 
 ADD_SUBDIRECTORY( modules )
-
-ADD_SUBDIRECTORY( tests )
+IF( ENABLE_TEST )
+	ADD_SUBDIRECTORY( tests )
+ENDIF( ENABLE_TEST )
 
 ADD_SUBDIRECTORY( tools )
 
diff -ruN oyranos-0.9.3/src/oyjl/makefile oyranos-0.9.3-patched/src/oyjl/makefile
--- oyranos-0.9.3/src/oyjl/makefile	2013-01-05 04:30:29.000000000 -0500
+++ oyranos-0.9.3-patched/src/oyjl/makefile	2013-01-06 10:41:52.946683026 -0500
@@ -1,11 +1,10 @@
 prefix=/usr
 
-CC = gcc
-DEBUG= -Wall -g
+CC ?= gcc
 INCL = -I$(prefix)/include -I../yajl/
 LDFLAGS = -L$(prefix)/lib64
 TARGET = oyjl_tree_test
-CFLAGS=$(DEBUG) $(INCL) -fPIC
+CFLAGS=$(INCL) -fPIC
 SOURCES = \
 	oyjl_tree_parse.c \
 	$(TARGET).c