Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 24837 | Differences between
and this patch

Collapse All | Expand All

(-)separate.gimp20.bak/Makefile (-8 / +10 lines)
Lines 3-20 Link Here
3
3
4
GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
4
GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
5
GTK_LIB = `pkg-config gtk+-2.0 --libs`
5
GTK_LIB = `pkg-config gtk+-2.0 --libs`
6
GIMP_INCLUDE = `pkg-config gimp-1.3 --cflags` `pkg-config gimpui-1.3 --cflags`
6
GIMP_INCLUDE = `pkg-config gimp-2.0 --cflags` `pkg-config gimpui-2.0 --cflags`
7
GIMP_LIB = `pkg-config gimp-1.3 --libs` `pkg-config gimpui-1.3 --libs`
7
GIMP_LIB = `pkg-config gimp-2.0 --libs` `pkg-config gimpui-2.0 --libs`
8
LCMS_LIB = -llcms
8
LCMS_LIB = -llcms
9
TIFF_LIB = -ltiff
9
TIFF_LIB = -ltiff
10
10
11
INCLUDES = $(GIMP_INCLUDE) $(GTK_INCLUDE)
12
LIBRARIES = $(GIMP_LIB) $(GTK_LIB) $(LCMS_LIB) $(TIFF_LIB)
13
11
VERSION = 0.1
14
VERSION = 0.1
12
CC = gcc -g
15
CC = gcc -g
13
DEPEND = gccmakedep
16
DEPEND = gccmakedep
14
RM = rm -f
17
RM = rm -f
15
18
16
CFLAGS = $(GIMP_INCLUDE) $(GTK_INCLUDE) -O2 -Wall
19
CFLAGS = -O2 -Wall
17
LDFLAGS = $(GIMP_LIB) $(GTK_LIB) $(LCMS_LIB) $(TIFF_LIB)
20
LDFLAGS = 
18
21
19
SOURCES = \
22
SOURCES = \
20
	separate.c util.c tiff.c
23
	separate.c util.c tiff.c
Lines 26-38 Link Here
26
all:	 $(TARGETS)
29
all:	 $(TARGETS)
27
30
28
depend:
31
depend:
29
	$(DEPEND) -- $(CFLAGS) -- $(SOURCES)
32
	$(DEPEND) -- $(CFLAGS) $(INCLUDES) -- $(SOURCES)
30
33
31
clean:
34
clean:
32
	$(RM) $(OBJECTS) $(TARGETS) core *~
35
	$(RM) $(OBJECTS) $(TARGETS) core *~
33
36
34
separate: $(OBJECTS)
37
separate: $(OBJECTS)
35
	$(CC) separate.o util.o tiff.o -o $@ $(LDFLAGS)
38
	$(CC) separate.o util.o tiff.o -o $@ $(LDFLAGS) $(LIBRARIES)
36
39
37
install: separate
40
install: separate
38
	gimptool-2.0 --install-bin separate
41
	gimptool-2.0 --install-bin separate
Lines 43-47 Link Here
43
# Inference rules
46
# Inference rules
44
47
45
.c.o:
48
.c.o:
46
	$(CC) $(CFLAGS) -c $<
49
	$(CC) $(CFLAGS) $(INCLUDES) -c $<
47
(-)separate.gimp20.bak/platform_unix.h (-2 / +2 lines)
Lines 1-8 Link Here
1
#ifndef SEPARATE_PLATFORM_H
1
#ifndef SEPARATE_PLATFORM_H
2
#define SEPARATE_PLATFORM_H
2
#define SEPARATE_PLATFORM_H
3
3
4
#define DEFAULT_RGB_PROFILE "/usr/local/share/iccprofiles/sRGB Color Space Profile.icm"
4
#define DEFAULT_RGB_PROFILE "/usr/share/lcms/profiles/sRGB Color Space Profile.icm"
5
#define DEFAULT_CMYK_PROFILE "/usr/local/share/iccprofiles/EuroscaleCoated.icc"
5
#define DEFAULT_CMYK_PROFILE "/usr/share/iccprofiles/Adobe ICC Profiles/CMYK Profiles/EuroscaleCoated.icc"
6
6
7
#define DEBUG(x) fprintf(stdout,x); fflush(stdout)
7
#define DEBUG(x) fprintf(stdout,x); fflush(stdout)
8
8
(-)separate.gimp20.bak/separate.c (-1 / +1 lines)
Lines 27-33 Link Here
27
#include <libgimp/gimp.h>
27
#include <libgimp/gimp.h>
28
#include <libgimp/gimpui.h>
28
#include <libgimp/gimpui.h>
29
29
30
#include <lcms.h>
30
#include <lcms/lcms.h>
31
31
32
#include "separate.h"
32
#include "separate.h"
33
33
(-)separate.gimp20.bak/util.c (-1 / +1 lines)
Lines 6-12 Link Here
6
#include <gtk/gtk.h>
6
#include <gtk/gtk.h>
7
7
8
#include <libgimp/gimp.h>
8
#include <libgimp/gimp.h>
9
#include <lcms.h>
9
#include <lcms/lcms.h>
10
10
11
#include "platform.h"
11
#include "platform.h"
12
#include "util.h"
12
#include "util.h"

Return to bug 24837