Attachment #346396 for bug #464042

View | Details | Raw Unified | Return to bug 464042
Collapse All | Expand All

Lines 40-45 Link Here

(-)"The Unarchiver/UniversalDetector/Makefile.linux" (+1 lines)
40	LIBS = -Wl,--no-whole-archive \	40	LIBS = -Wl,--no-whole-archive \
41	-lgnustep-base \	41	-lgnustep-base \
42	-lobjc \	42	-lobjc \
		43	-lstdc++ \
43	-lm	44	-lm
44		45
45	ALL_LDFLAGS = -Wl,--whole-archive \	46	ALL_LDFLAGS = -Wl,--whole-archive \

Lines 43-48 Link Here

(-)"The Unarchiver/XADMaster/Makefile.linux" (-1 / +2 lines)
43	-lbz2 \	43	-lbz2 \
44	-licuuc \	44	-licuuc \
45	-lobjc \	45	-lobjc \
		46	-lstdc++ \
46	-lm	47	-lm
47		48
48	ALL_LDFLAGS = -Wl,--whole-archive \	49	ALL_LDFLAGS = -Wl,--whole-archive \
Lines 71-77 Link Here
71	$(AR) rcs $@ $^	72	$(AR) rcs $@ $^
72		73
73	../UniversalDetector/libUniversalDetector.a:	74	../UniversalDetector/libUniversalDetector.a:
74	make -C ../UniversalDetector -f Makefile.linux	75	+$(MAKE) -C ../UniversalDetector -f Makefile.linux
75		76
76	XADTest2: $(XADTEST2_OBJS) libXADMaster.a ../UniversalDetector/libUniversalDetector.a	77	XADTest2: $(XADTEST2_OBJS) libXADMaster.a ../UniversalDetector/libUniversalDetector.a
77	$(LD) $(ALL_LDFLAGS) -o $@ $^ $(LIBS)	78	$(LD) $(ALL_LDFLAGS) -o $@ $^ $(LIBS)

Return to bug 464042