Attachment #65128 for bug #101393

View | Details | Raw Unified | Return to bug 101393 | Differences between
Collapse All | Expand All




MEMBERS = gpe-plucker

GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -DGTK_DISABLE_DEPRECATED
#GTKLDFLAGS += -L/skiff/local/arm-linux/lib/X11 `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext
GTKLDFLAGS += -L/usr/X11R6/lib `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext

PACKAGE_CFLAGS = $(GTKCFLAGS) -Iunpluck/ -DUSE_GPE -D_GNU_SOURCE -Wall
ifeq ($(DEBUG),yes)
PACKAGE_CFLAGS += -O2 -g
PACKAGE_LDFLAGS = -g #-lefence
else
PACKAGE_CFLAGS += -Os -fomit-frame-pointer
endif
PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"

ifeq ($(CVSBUILD),yes)
PACKAGE_CFLAGS += -I../libgpewidget
PACKAGE_LDFLAGS += -L../libgpewidget
BUILD = ../build
else
PACKAGE_CFLAGS += -I/usr/include/gpe
BUILD = build
endif
PACKAGE_LDFLAGS += -lgpewidget $(GTKLDFLAGS) -Lunpluck -lunpluck -lz

#OBJS = $(patsubst %,%.o,$(MEMBERS))
#SOURCES = $(patsubst %,%.c,$(MEMBERS))
SOURCES = image.c library.c viewer.c
OBJS = ${SOURCES:.c=.o}

.PHONY: unpluck

all: unpluck $(PACKAGE)

unpluck:
	make -C unpluck

$(PACKAGE): $(OBJS) $(LIB)
	$(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)

install-program: all $(PACKAGE).desktop
	mkdir -p $(DESTDIR)$(PREFIX)/bin




# -DFILE_SEPARATOR_CHAR_S="/"
# -DOS_SECTION_NAME="posix"

CC	=	gcc
AR	=	ar
RANLIB	=	ranlib

PACKAGE_CFLAGS	=	-Wall -O2 -g

PACKAGE_CFLAGS +=	-DPLUCKER_VERSION="1.6.1" -DPLUCKER_CONFIG_DIR="/etc"
PACKAGE_CFLAGS +=	-DSYS_CONFIG_FILE_NAME="pluckerrc" -DUSER_CONFIG_FILE_NAME=".pluckerrc"
PACKAGE_CFLAGS +=	-DFILE_SEPARATOR_CHAR_S="/" -DOS_SECTION_NAME="posix"

SRC	=	config.c unpluck.c util.c
OBJS	=	${SRC:.c=.o}

Return to bug 101393

Lines 8-47 Link Here

(-)../gpe-plucker-0.1-r0/gpe-plucker-0.1/Makefile (-13 / +15 lines)
8	MEMBERS = gpe-plucker	8	MEMBERS = gpe-plucker
9		9
10	GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -DGTK_DISABLE_DEPRECATED	10	GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -DGTK_DISABLE_DEPRECATED
11	#GTKLDFLAGS += -L/skiff/local/arm-linux/lib/X11 `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext -lXinerama	11	#GTKLDFLAGS += -L/skiff/local/arm-linux/lib/X11 `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext
12	GTKLDFLAGS += -L/usr/X11R6/lib `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext -lXinerama	12	GTKLDFLAGS += -L/usr/X11R6/lib `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext
13		13
14	CFLAGS = $(GTKCFLAGS) -Iunpluck/ -DUSE_GPE -D_GNU_SOURCE -Wall	14	PACKAGE_CFLAGS = $(GTKCFLAGS) -Iunpluck/ -DUSE_GPE -D_GNU_SOURCE -Wall
15	ifeq ($(DEBUG),yes)	15	ifeq ($(DEBUG),yes)
16	CFLAGS += -O2 -g	16	PACKAGE_CFLAGS += -O2 -g
17	LDFLAGS = -g #-lefence	17	PACKAGE_LDFLAGS = -g #-lefence
18	else	18	else
19	CFLAGS += -Os -fomit-frame-pointer	19	PACKAGE_CFLAGS += -Os -fomit-frame-pointer
20	endif	20	endif
21	CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"	21	PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
22		22
23	ifeq ($(CVSBUILD),yes)	23	ifeq ($(CVSBUILD),yes)
24	CFLAGS += -I../libgpewidget	24	PACKAGE_CFLAGS += -I../libgpewidget
25	LDFLAGS += -L../libgpewidget	25	PACKAGE_LDFLAGS += -L../libgpewidget
26	BUILD = ../build	26	BUILD = ../build
27	else	27	else
28	CFLAGS += -I/usr/include/gpe	28	PACKAGE_CFLAGS += -I/usr/include/gpe
29	BUILD = build	29	BUILD = build
30	endif	30	endif
31	LDFLAGS += -lgpewidget $(GTKLDFLAGS) -Lunpluck/ -lunpluck -lz	31	PACKAGE_LDFLAGS += -lgpewidget $(GTKLDFLAGS) -Lunpluck -lunpluck -lz
32		32
33	#OBJS = $(patsubst %,%.o,$(MEMBERS))	33	#OBJS = $(patsubst %,%.o,$(MEMBERS))
34	#SOURCES = $(patsubst %,%.c,$(MEMBERS))	34	#SOURCES = $(patsubst %,%.c,$(MEMBERS))
35	SOURCES = image.c library.c viewer.c	35	SOURCES = image.c library.c viewer.c
36	OBJS = ${SOURCES:.c=.o}	36	OBJS = ${SOURCES:.c=.o}
37		37
		38	.PHONY: unpluck
		39
38	all: unpluck $(PACKAGE)	40	all: unpluck $(PACKAGE)
39		41
40	unpluck:	42	unpluck:
41	(cd unpluck; make)	43	make -C unpluck
42		44
43	$(PACKAGE): $(OBJS) $(LIB)	45	$(PACKAGE): $(OBJS) $(LIB)
44	$(CC) -o $@ $^ $(LDFLAGS)	46	$(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
45		47
46	install-program: all $(PACKAGE).desktop	48	install-program: all $(PACKAGE).desktop
47	mkdir -p $(DESTDIR)$(PREFIX)/bin	49	mkdir -p $(DESTDIR)$(PREFIX)/bin

Lines 5-19 Link Here

(-)../gpe-plucker-0.1-r0/gpe-plucker-0.1/unpluck/Makefile (-5 / +4 lines)
5	# -DFILE_SEPARATOR_CHAR_S="/"	5	# -DFILE_SEPARATOR_CHAR_S="/"
6	# -DOS_SECTION_NAME="posix"	6	# -DOS_SECTION_NAME="posix"
7		7
8	CC = gcc
9	AR = ar	8	AR = ar
10	RANLIB = ranlib	9	RANLIB = ranlib
11		10
12	CFLAGS = -Wall -O2 -g	11	PACKAGE_CFLAGS = -Wall -O2 -g
13		12
14	CFLAGS += -DPLUCKER_VERSION="1.6.1" -DPLUCKER_CONFIG_DIR="/etc"	13	PACKAGE_CFLAGS += -DPLUCKER_VERSION="1.6.1" -DPLUCKER_CONFIG_DIR="/etc"
15	CFLAGS += -DSYS_CONFIG_FILE_NAME="pluckerrc" -DUSER_CONFIG_FILE_NAME=".pluckerrc"	14	PACKAGE_CFLAGS += -DSYS_CONFIG_FILE_NAME="pluckerrc" -DUSER_CONFIG_FILE_NAME=".pluckerrc"
16	CFLAGS += -DFILE_SEPARATOR_CHAR_S="/" -DOS_SECTION_NAME="posix"	15	PACKAGE_CFLAGS += -DFILE_SEPARATOR_CHAR_S="/" -DOS_SECTION_NAME="posix"
17		16
18	SRC = config.c unpluck.c util.c	17	SRC = config.c unpluck.c util.c
19	OBJS = ${SRC:.c=.o}	18	OBJS = ${SRC:.c=.o}