summaryrefslogtreecommitdiff
blob: 6eebb8650fbda1e489b9e0c103abe268ccce9e57 (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
29
--- Makefile.orig	2007-11-13 16:31:55.000000000 +0100
+++ Makefile	2007-11-13 16:33:04.000000000 +0100
@@ -113,18 +113,9 @@
 QC=@echo '===> Compiling $<'; 
 QL=@echo '===> Linking $@'; 
 
-# using "--as-needed" to cut down link requirements (check by "readelf -d /usr/bin/notecase | grep NEEDED") 
-ifeq ($(LDFLAGS),)
-ifdef OSX_BUILD
- LDFLAGS=-Os -Wl -bind_at_load
-else
- LDFLAGS=-Os -Wl,--as-needed
-endif
-
 ifneq ($(NOKIA_MAEMO_BUILD),)
  LDFLAGS += -ansi
 endif
-endif
 
 # define compile/link command line with flags
 CC=$(QC) $(CXX) $(DEBUG) $(PROFILE) -DENABLE_NLS
@@ -158,7 +149,6 @@
  $(OBJ)/IOLayerRedirect.o $(OBJ)/FileExportDlg.o $(OBJ)/FormatIOTxt.o $(OBJ)/FindReplaceDlg.o \
  $(OBJ)/FindReplaceInfo.o $(OBJ)/LinkInfo.o $(OBJ)/LinkPropertiesDlg.o $(OBJ)/ExecuteFile.o \
  $(OBJ)/FileSaveAsDlg.o $(OBJ)/CircularBuffer.o $(OBJ)/FormatIOMMLX.o \
- $(OBJ)/libz.a \
  $(OBJ)/ProgressDlg.o $(OBJ)/DocActionPix.o $(OBJ)/DocActionFinish.o $(OBJ)/DocActionFmt.o $(OBJ)/FmtInfo.o \
  $(OBJ)/FileAttachmentDlg.o $(OBJ)/DocActionAtt.o $(OBJ)/PixPropertiesDlg.o $(OBJ)/DocActionFinishDel.o \
  $(OBJ)/ShortcutsList.o $(OBJ)/ShortcutsListDlg.o $(OBJ)/DateTimeDlg.o $(OBJ)/AboutDlg.o $(OBJ)/EditDlg.o