Attachment #334672 for bug #450494




++ oyranos-0.9.3/src/examples/oforms/oyranos_xforms.makefile

INCL    = $(INCLUDE) -I../ -I./
CC      ?= gcc
CXX     ?= c++
LDFLAGS_ = $$LDFLAGS -L../fl_i18n
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



oyranos-xforms:	$(SRCDIR)oyranos_xforms.c
	echo "Compiling $(SRCDIR)$< + Linking $@ ..."
	$(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 $@ ..."
	$(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 $@ ..."
	$(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


if [ "$echo_ldflags" = "yes" ]; then
  if [ -f liboyranos.so ]; then
    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"

Lines 194-201 Link Here

(-)oyranos-0.9.3/src/CMakeLists.txt (-2 / +3 lines)
194	ADD_SUBDIRECTORY( liboyranos )	194	ADD_SUBDIRECTORY( liboyranos )
195		195
196	ADD_SUBDIRECTORY( modules )	196	ADD_SUBDIRECTORY( modules )
197		197	IF( ENABLE_TEST )
198	ADD_SUBDIRECTORY( tests )	198	ADD_SUBDIRECTORY( tests )
		199	ENDIF( ENABLE_TEST )
199		200
200	ADD_SUBDIRECTORY( tools )	201	ADD_SUBDIRECTORY( tools )
201		202

Lines 1-11 Link Here

(-)oyranos-0.9.3/src/oyjl/makefile (-3 / +2 lines)
1	prefix=/usr	1	prefix=/usr
2		2
3	CC = gcc	3	CC ?= gcc
4	DEBUG= -Wall -g
5	INCL = -I$(prefix)/include -I../yajl/	4	INCL = -I$(prefix)/include -I../yajl/
6	LDFLAGS = -L$(prefix)/lib64	5	LDFLAGS = -L$(prefix)/lib64
7	TARGET = oyjl_tree_test	6	TARGET = oyjl_tree_test
8	CFLAGS=$(DEBUG) $(INCL) -fPIC	7	CFLAGS=$(INCL) -fPIC
9	SOURCES = \	8	SOURCES = \
10	oyjl_tree_parse.c \	9	oyjl_tree_parse.c \
11	$(TARGET).c	10	$(TARGET).c

Return to bug 450494

Line Link Here

(-)file_not_specified_in_diff (-10 / +10 lines)
0	-- oyranos-0.9.3/src/examples/oforms/oyranos_xforms.makefile	0	++ oyranos-0.9.3/src/examples/oforms/oyranos_xforms.makefile
Lines 1-8 Link Here
1	INCL = $(INCLUDE) -I../ -I./ $(DEBUG)	1	INCL = $(INCLUDE) -I../ -I./
2	CC = gcc	2	CC ?= gcc
3	DEBUG = -Wall -g -O0	3	CXX ?= c++
4	LDFLAGS_ = $$LDFLAGS -L../fl_i18n	4	LDFLAGS_ = $$LDFLAGS -L../fl_i18n
5	OY_LIBS := $(shell pkg-config oyranos libxml-2.0 --libs --cflags)	5	OY_LIBS := $(shell pkg-config libxml-2.0 --libs --cflags) ../liboyranos.so ../liboyranos_object.so ../liboyranos_core.so ../liboyranos_config.so ../liboyranos_modules.so
6	OY_FLAGS = -L../ $(OY_LIBS)	6	OY_FLAGS = -L../ $(OY_LIBS)
7	FLTK_FLAGS := $(shell fltk-config --ldflags --cxxflags \| sed s/-O2//) -lpthread	7	FLTK_FLAGS := $(shell fltk-config --ldflags --cxxflags \| sed s/-O2//) -lpthread
8		8
Lines 15-29 Link Here
15		15
16	oyranos-xforms: $(SRCDIR)oyranos_xforms.c	16	oyranos-xforms: $(SRCDIR)oyranos_xforms.c
17	echo "Compiling $(SRCDIR)$< + Linking $@ ..."	17	echo "Compiling $(SRCDIR)$< + Linking $@ ..."
18	gcc -Wall -g $(CFLAGS) $(INCL) $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS_)	18	$(CC) -Wall $(CFLAGS) $(LDFLAGS) $(INCL) $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS_)
19		19
20	oyranos-xforms-modules: $(SRCDIR)oyranos_xforms_modules.c	20	oyranos-xforms-modules: $(SRCDIR)oyranos_xforms_modules.c
21	echo "Compiling $(SRCDIR)$< + Linking $@ ..."	21	echo "Compiling $(SRCDIR)$< + Linking $@ ..."
22	gcc -Wall -g $(CFLAGS) $(INCL) $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS_)	22	$(CC) -Wall $(CFLAGS) $(LDFLAGS) $(INCL) $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS_)
23		23
24	oyranos-xforms-fltk: $(SRCDIR)oyranos_xforms_fltk.cxx $(SRCDIR)oyranos_forms_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.h	24	oyranos-xforms-fltk: $(SRCDIR)oyranos_xforms_fltk.cxx $(SRCDIR)oyranos_forms_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.h
25	echo "Compiling $(SRCDIR)$< + Linking $@ ..."	25	echo "Compiling $(SRCDIR)$< + Linking $@ ..."
26	-c++ $(LDFLAGS_) -Wall -g $(CXXFLAGS) $(INCL) $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS)	26	$(CXX) $(LDFLAGS_) -Wall $(CXXFLAGS) $(LDFLAGS) $(INCL) $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS)
27		27
28		28
29	# Build commands and filename extensions...	29	# Build commands and filename extensions...
30	-- oyranos-0.9.3/extras/oyranos-config.in	30	++ oyranos-0.9.3/extras/oyranos-config.in
Lines 109-115 Link Here
109		109
110	if [ "$echo_ldflags" = "yes" ]; then	110	if [ "$echo_ldflags" = "yes" ]; then
111	if [ -f liboyranos.so ]; then	111	if [ -f liboyranos.so ]; then
112	echo "-L. -loyranos -loyranos_config -loyranos_modules -loyranos_object -loyranos_core $elektra $oyranos_add"	112	echo "lliboyranos.so liboyranos_config.so liboyranos_modules.so liboyranos_object.so liboyranos_core.so $elektra $oyranos_add"
113	else	113	else
114	echo "-L$libdir -loyranos -loyranos_config -loyranos_modules -loyranos_object -loyranos_core $elektra $oyranos_add"	114	echo "-L$libdir -loyranos -loyranos_config -loyranos_modules -loyranos_object -loyranos_core $elektra $oyranos_add"