Attachment #244933 for bug #334821




++ Makefile 

	FixedKeyFile.vapi \
	ExtendedPosix.vapi \
	LConv.vapi \
	libraw_r.vapi \
	gdk-none.vapi

RESOURCE_FILES = \

	LConv \
	gdk-none

# libraw is not listed (see note below); when libraw-config is no longer needed, it should be
# added to this list
EXT_PKGS = \
	atk \
	gdk-2.0 \

	glib-2.0 \
	libexif \
	sqlite3 \
	gexiv2 \
	libraw_r
LIBRAW_PKG = \
	libraw

ifdef LINUX
EXT_PKGS += \

	gdk-x11-2.0
endif

# libraw is handled separately (see note below); when libraw-config is no longer needed, the version
# should be added to this list
EXT_PKG_VERSIONS = \
	gee-1.0 >= 0.5.0 \
	gtk+-2.0 >= 2.18.0 \
	glib-2.0 >= 2.24.0 \
	libexif >= 0.6.16 \
	sqlite3 >= 3.5.9 \
	gexiv2 >= 0.2.0 \
	libraw_r >= 0.9.0
LIBRAW_VERSION = \
	0.9.0

ifdef LINUX
EXT_PKG_VERSIONS += \

	dbus-glib-1 >= 0.80
endif

PKGS = $(EXT_PKGS) $(LOCAL_PKGS)

ifndef BUILD_DIR
BUILD_DIR=src

DIST_FILES = Makefile configure minver $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) \
	$(EXPANDED_SRC_HEADER_FILES) $(EXPANDED_RESOURCE_FILES) $(TEXT_FILES) $(EXPANDED_ICON_FILES) \
	$(EXPANDED_SYS_INTEGRATION_FILES) $(EXPANDED_PO_FILES) po/shotwell.pot windows/install-deps \
	windows/shotwell.rc windows/winstall.iss src/windows.c src/GConf.vala \
	$(EXPANDED_HELP_FILES) $(EXPANDED_HELP_IMAGES) apport/shotwell.py

DIST_TAR = $(PROGRAM)-$(VERSION).tar

CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
endif

ifneq (,$(findstring fopenmp,$(shell pkg-config --cflags libraw_r)))
# If libraw is built with OpenMP support, we'll need this.
CFLAGS += -fopenmp
LIBRAW_CONFIG=./libraw-config
endif

ifdef WINDOWS
LIBRAW_CONFIG=./libraw-config --windows
endif

$(LANG_STAMP): $(EXPANDED_PO_FILES)

else ifdef EXT_PKGS
	@pkg-config --print-errors --exists $(EXT_PKGS)
endif
# Check for libraw manually, but not on Windows, where install-deps is used
ifndef WINDOWS
	@$(LIBRAW_CONFIG) --exists=$(LIBRAW_VERSION)
endif
endif
	@ type msgfmt > /dev/null || ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 )
	mkdir -p $(BUILD_DIR)

	@

$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
	$(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $<

$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@

glade: lib$(PROGRAM).so

lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -shared -o $@

shotwell-setup-$(VERSION).exe: $(PROGRAM) windows/winstall.iss
	iscc windows\winstall.iss

Return to bug 334821

Line Link Here

(-)file_not_specified_in_diff (-31 / +14 lines)
0	-- Makefile.orig	0	++ Makefile
Lines 135-141 Link Here
135	FixedKeyFile.vapi \	135	FixedKeyFile.vapi \
136	ExtendedPosix.vapi \	136	ExtendedPosix.vapi \
137	LConv.vapi \	137	LConv.vapi \
138	libraw.vapi \	138	libraw_r.vapi \
139	gdk-none.vapi	139	gdk-none.vapi
140		140
141	RESOURCE_FILES = \	141	RESOURCE_FILES = \
Lines 258-265 Link Here
258	LConv \	258	LConv \
259	gdk-none	259	gdk-none
260		260
261	# libraw is not listed (see note below); when libraw-config is no longer needed, it should be
262	# added to this list
263	EXT_PKGS = \	261	EXT_PKGS = \
264	atk \	262	atk \
265	gdk-2.0 \	263	gdk-2.0 \
Lines 268-277 Link Here
268	glib-2.0 \	266	glib-2.0 \
269	libexif \	267	libexif \
270	sqlite3 \	268	sqlite3 \
271	gexiv2	269	gexiv2 \
272		270	libraw_r
273	LIBRAW_PKG = \
274	libraw
275		271
276	ifdef LINUX	272	ifdef LINUX
277	EXT_PKGS += \	273	EXT_PKGS += \
Lines 286-303 Link Here
286	gdk-x11-2.0	282	gdk-x11-2.0
287	endif	283	endif
288		284
289	# libraw is handled separately (see note below); when libraw-config is no longer needed, the version
290	# should be added to this list
291	EXT_PKG_VERSIONS = \	285	EXT_PKG_VERSIONS = \
292	gee-1.0 >= 0.5.0 \	286	gee-1.0 >= 0.5.0 \
293	gtk+-2.0 >= 2.18.0 \	287	gtk+-2.0 >= 2.18.0 \
294	glib-2.0 >= 2.24.0 \	288	glib-2.0 >= 2.24.0 \
295	libexif >= 0.6.16 \	289	libexif >= 0.6.16 \
296	sqlite3 >= 3.5.9 \	290	sqlite3 >= 3.5.9 \
297	gexiv2 >= 0.2.0	291	gexiv2 >= 0.2.0 \
298		292	libraw_r >= 0.9.0
299	LIBRAW_VERSION = \
300	0.9.0
301		293
302	ifdef LINUX	294	ifdef LINUX
303	EXT_PKG_VERSIONS += \	295	EXT_PKG_VERSIONS += \
Lines 311-317 Link Here
311	dbus-glib-1 >= 0.80	303	dbus-glib-1 >= 0.80
312	endif	304	endif
313		305
314	PKGS = $(EXT_PKGS) $(LOCAL_PKGS) $(LIBRAW_PKG)	306	PKGS = $(EXT_PKGS) $(LOCAL_PKGS)
315		307
316	ifndef BUILD_DIR	308	ifndef BUILD_DIR
317	BUILD_DIR=src	309	BUILD_DIR=src
Lines 342-348 Link Here
342	DIST_FILES = Makefile configure minver $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) \	334	DIST_FILES = Makefile configure minver $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) \
343	$(EXPANDED_SRC_HEADER_FILES) $(EXPANDED_RESOURCE_FILES) $(TEXT_FILES) $(EXPANDED_ICON_FILES) \	335	$(EXPANDED_SRC_HEADER_FILES) $(EXPANDED_RESOURCE_FILES) $(TEXT_FILES) $(EXPANDED_ICON_FILES) \
344	$(EXPANDED_SYS_INTEGRATION_FILES) $(EXPANDED_PO_FILES) po/shotwell.pot windows/install-deps \	336	$(EXPANDED_SYS_INTEGRATION_FILES) $(EXPANDED_PO_FILES) po/shotwell.pot windows/install-deps \
345	windows/shotwell.rc windows/winstall.iss src/windows.c src/GConf.vala libraw-config \	337	windows/shotwell.rc windows/winstall.iss src/windows.c src/GConf.vala \
346	$(EXPANDED_HELP_FILES) $(EXPANDED_HELP_IMAGES) apport/shotwell.py	338	$(EXPANDED_HELP_FILES) $(EXPANDED_HELP_IMAGES) apport/shotwell.py
347		339
348	DIST_TAR = $(PROGRAM)-$(VERSION).tar	340	DIST_TAR = $(PROGRAM)-$(VERSION).tar
Lines 385-398 Link Here
385	CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE	377	CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
386	endif	378	endif
387		379
388	# Packaged libraw is not widely available, so we must fake what would be in its .pc file	380	ifneq (,$(findstring fopenmp,$(shell pkg-config --cflags libraw_r)))
389	# if not available.	381	# If libraw is built with OpenMP support, we'll need this.
390	ifdef LINUX	382	CFLAGS += -fopenmp
391	LIBRAW_CONFIG=./libraw-config
392	endif
393
394	ifdef WINDOWS
395	LIBRAW_CONFIG=./libraw-config --windows
396	endif	383	endif
397		384
398	$(LANG_STAMP): $(EXPANDED_PO_FILES)	385	$(LANG_STAMP): $(EXPANDED_PO_FILES)
Lines 523-532 Link Here
523	else ifdef EXT_PKGS	510	else ifdef EXT_PKGS
524	@pkg-config --print-errors --exists $(EXT_PKGS)	511	@pkg-config --print-errors --exists $(EXT_PKGS)
525	endif	512	endif
526	# Check for libraw manually, but not on Windows, where install-deps is used
527	ifndef WINDOWS
528	@$(LIBRAW_CONFIG) --exists=$(LIBRAW_VERSION)
529	endif
530	endif	513	endif
531	@ type msgfmt > /dev/null \|\| ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 )	514	@ type msgfmt > /dev/null \|\| ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 )
532	mkdir -p $(BUILD_DIR)	515	mkdir -p $(BUILD_DIR)
Lines 544-558 Link Here
544	@	527	@
545		528
546	$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile	529	$(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
547	$(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $<	530	$(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $<
548		531
549	$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)	532	$(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
550	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@	533	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@
551		534
552	glade: lib$(PROGRAM).so	535	glade: lib$(PROGRAM).so
553		536
554	lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)	537	lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
555	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@	538	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -shared -o $@
556		539
557	shotwell-setup-$(VERSION).exe: $(PROGRAM) windows/winstall.iss	540	shotwell-setup-$(VERSION).exe: $(PROGRAM) windows/winstall.iss
558	iscc windows\winstall.iss	541	iscc windows\winstall.iss