You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
34 lines
965 B
34 lines
965 B
Add LDFLAGS to linker calls
|
|
Fix deps on check targets for parallel tests
|
|
|
|
Patch by Kevin McCarthy <signals42@gmail.com>
|
|
|
|
--- Makefile.in
|
|
+++ Makefile.in
|
|
@@ -74,13 +74,13 @@
|
|
all: $(CONFIGURED) ical
|
|
|
|
ical: $(LIB3) $(LIB2) $(LIB1) $(OBJS) main.o
|
|
- $(CXXLINKER) -o $@ $(OBJS) main.o $(LIBS)
|
|
+ $(CXXLINKER) $(LDFLAGS) -o $@ $(OBJS) main.o $(LIBS)
|
|
|
|
ical-bundle: $(LIB3) $(LIB2) $(LIB1) $(OBJS) mbundle.o
|
|
- $(CXXLINKER) -o $@ $(OBJS) mbundle.o $(BLIBS)
|
|
+ $(CXXLINKER) $(LDFLAGS) -o $@ $(OBJS) mbundle.o $(BLIBS)
|
|
|
|
ical-tiny: $(LIB3) $(LIB2) $(LIB1) $(OBJS) mbundle.o
|
|
- $(CXXLINKER) -o $@ $(OBJS) mbundle.o $(TINY_BLIBS)
|
|
+ $(CXXLINKER) $(LDFLAGS) -o $@ $(OBJS) mbundle.o $(TINY_BLIBS)
|
|
|
|
$(LIB1): FRC
|
|
@echo making in calendar
|
|
@@ -195,7 +195,7 @@
|
|
check_text:
|
|
@ICAL_LIBRARY=$(srcdir) ./ical -nodisplay -f $(srcdir)/tests/no_x.tcl
|
|
|
|
-check_x:
|
|
+check_x: check_text
|
|
@ICAL_LIBRARY=$(srcdir) ./ical -f $(srcdir)/tests/x.tcl
|
|
|
|
# Rules for shipping html documentation
|