Attachment #304669 for bug #407485




PKGC=$TARGET.pc
VERS_H="$TARGET"_version.h
zeile="$0 $@"
MAKEFILE_DIR=". fl_i18n libXNVCtrl"; export MAKEFILE_DIR

if [ `uname` = "Linux" ]; then
  v=-v

OY_DEVEL_MONTH=03
OYRANOS_DEVEL_MONTH=3 # numeric
OY_DEVEL_YEAR=2012
OY_GIT_MASTER=""
time="`date +%y%m%d.%H%M%S`"
DATE="$OY_START_MONTH $OY_START_YEAR - $OY_DEVEL_MONTH $OY_DEVEL_YEAR"
VERSION=$VERSION_A.$VERSION_B.$VERSION_C

fi
IFS=$old_IFS

STRIPOPT="cat"

if [ $# -gt 0 ]; then
  prefix=""

Lines 3-9 Link Here

(-)a/configure_tests.sh (-1 / +1 lines)
3	set > testset.txt	3	set > testset.txt
4	ERROR=0	4	ERROR=0
5	WARNING=0	5	WARNING=0
6	STRIPOPT='s/-O.// ; s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//'	6	STRIPOPT='s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//'
7		7
8	mkdir -p tests	8	mkdir -p tests
9		9




INCL    = $(INCLUDE) -I../ -I./ $(DEBUG)
CC      ?= gcc
CXX    ?=
DEBUG  = -Wall -g -O0
LDFLAGS_ += -L../fl_i18n
OY_LIBS := $(shell pkg-config oyranos libxml-2.0 --libs --cflags)
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 -g $(CFLAGS) $(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 -g $(CFLAGS) $(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 -g $(CXXFLAGS) $(INCL)  $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS)


# Build commands and filename extensions...

Return to bug 407485

Lines 30-36 Link Here

(-)a/configure (-3 / +3 lines)
30	PKGC=$TARGET.pc	30	PKGC=$TARGET.pc
31	VERS_H="$TARGET"_version.h	31	VERS_H="$TARGET"_version.h
32	zeile="$0 $@"	32	zeile="$0 $@"
33	MAKEFILE_DIR=". fl_i18n libXNVCtrl yajl"; export MAKEFILE_DIR	33	MAKEFILE_DIR=". fl_i18n libXNVCtrl"; export MAKEFILE_DIR
34		34
35	if [ `uname` = "Linux" ]; then	35	if [ `uname` = "Linux" ]; then
36	v=-v	36	v=-v
Lines 68-74 Link Here
68	OY_DEVEL_MONTH=03	68	OY_DEVEL_MONTH=03
69	OYRANOS_DEVEL_MONTH=3 # numeric	69	OYRANOS_DEVEL_MONTH=3 # numeric
70	OY_DEVEL_YEAR=2012	70	OY_DEVEL_YEAR=2012
71	OY_GIT_MASTER="`cat $ROOT_DIR/.git/refs/heads/master`"	71	OY_GIT_MASTER=""
72	time="`date +%y%m%d.%H%M%S`"	72	time="`date +%y%m%d.%H%M%S`"
73	DATE="$OY_START_MONTH $OY_START_YEAR - $OY_DEVEL_MONTH $OY_DEVEL_YEAR"	73	DATE="$OY_START_MONTH $OY_START_YEAR - $OY_DEVEL_MONTH $OY_DEVEL_YEAR"
74	VERSION=$VERSION_A.$VERSION_B.$VERSION_C	74	VERSION=$VERSION_A.$VERSION_B.$VERSION_C
Lines 120-126 Link Here
120	fi	120	fi
121	IFS=$old_IFS	121	IFS=$old_IFS
122		122
123	STRIPOPT="sed s/-O.//"	123	STRIPOPT="cat"
124		124
125	if [ $# -gt 0 ]; then	125	if [ $# -gt 0 ]; then
126	prefix=""	126	prefix=""

Lines 1-7 Link Here

(-)a/oforms/oyranos_xforms.makefile (-5 / +6 lines)
1	INCL = $(INCLUDE) -I../ -I./ $(DEBUG)	1	INCL = $(INCLUDE) -I../ -I./ $(DEBUG)
2	CC = gcc	2	CC ?= gcc
		3	CXX ?=
3	DEBUG = -Wall -g -O0	4	DEBUG = -Wall -g -O0
4	LDFLAGS_ = $$LDFLAGS -L../fl_i18n	5	LDFLAGS_ += -L../fl_i18n
5	OY_LIBS := $(shell pkg-config oyranos libxml-2.0 --libs --cflags)	6	OY_LIBS := $(shell pkg-config oyranos libxml-2.0 --libs --cflags)
6	OY_FLAGS = -L../ $(OY_LIBS)	7	OY_FLAGS = -L../ $(OY_LIBS)
7	FLTK_FLAGS := $(shell fltk-config --ldflags --cxxflags \| sed s/-O2//) -lpthread	8	FLTK_FLAGS := $(shell fltk-config --ldflags --cxxflags \| sed s/-O2//) -lpthread
Lines 16-30 Link Here
16		17
17	oyranos-xforms: $(SRCDIR)oyranos_xforms.c	18	oyranos-xforms: $(SRCDIR)oyranos_xforms.c
18	echo "Compiling $(SRCDIR)$< + Linking $@ ..."	19	echo "Compiling $(SRCDIR)$< + Linking $@ ..."
19	gcc -Wall -g $(CFLAGS) $(INCL) $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS_)	20	$(CC) -Wall -g $(CFLAGS) $(INCL) $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS_)
20		21
21	oyranos-xforms-modules: $(SRCDIR)oyranos_xforms_modules.c	22	oyranos-xforms-modules: $(SRCDIR)oyranos_xforms_modules.c
22	echo "Compiling $(SRCDIR)$< + Linking $@ ..."	23	echo "Compiling $(SRCDIR)$< + Linking $@ ..."
23	gcc -Wall -g $(CFLAGS) $(INCL) $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS_)	24	$(CC) -Wall -g $(CFLAGS) $(INCL) $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS_)
24		25
25	oyranos-xforms-fltk: $(SRCDIR)oyranos_xforms_fltk.cxx $(SRCDIR)oyranos_forms_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.h	26	oyranos-xforms-fltk: $(SRCDIR)oyranos_xforms_fltk.cxx $(SRCDIR)oyranos_forms_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.h
26	echo "Compiling $(SRCDIR)$< + Linking $@ ..."	27	echo "Compiling $(SRCDIR)$< + Linking $@ ..."
27	-c++ $(LDFLAGS_) -Wall -g $(CXXFLAGS) $(INCL) $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS)	28	$(CXX) $(LDFLAGS_) -Wall -g $(CXXFLAGS) $(INCL) $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS)
28		29
29		30
30	# Build commands and filename extensions...	31	# Build commands and filename extensions...