summaryrefslogtreecommitdiff
blob: 97a9956bf52dc13f3d864f75b790382af03c4a60 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
Respect LDFLAGS when building C files. Bug #435048
Patch hasn't been sent upstream yet.
Index: shotwell-0.13.1/Makefile
===================================================================
--- shotwell-0.13.1.orig/Makefile
+++ shotwell-0.13.1/Makefile
@@ -697,7 +697,7 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
 	@
 
 $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
-	$(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $<
+	$(CC) -c $(VALA_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
 $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN)
 	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@
Index: shotwell-0.13.1/plugins/Makefile.plugin.mk
===================================================================
--- shotwell-0.13.1.orig/plugins/Makefile.plugin.mk
+++ shotwell-0.13.1/plugins/Makefile.plugin.mk
@@ -54,7 +54,7 @@ $(CFILES): .stamp
 	@
 
 $(OFILES): %.o: %.c $(CFILES)
-	$(CC) -c $(CFLAGS) $(DEFINES) -I../.. $(CFILES)
+	$(CC) -c $(CFLAGS) $(LDFLAGS) $(DEFINES) -I../.. $(CFILES)
 
 $(PLUGIN).so: $(OFILES)
 	$(CC) $(CFLAGS) $(LDFLAGS) -shared $(OFILES) $(LIBS) -o $@