patches/evolution-05-build-capplet.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 17783 94e59b6e8dd9
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17783
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
     1
--- evolution-2.30.0.1/capplet/Makefile.am.orig	2010-03-31 10:39:02.070633273 +0800
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
     2
+++ evolution-2.30.0.1/capplet/Makefile.am	2010-03-31 10:39:15.620158687 +0800
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
     3
@@ -32,7 +32,6 @@
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
     4
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" 
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
     5
 	
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
     6
 AM_CFLAGS =\
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
     7
-	 -Wall\
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
     8
 	 -g -O0 
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
     9
 
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
    10
 bin_PROGRAMS = evolution-settings
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
    11
@@ -41,8 +40,7 @@
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
    12
 evolution_settings_SOURCES  = \
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
    13
 	anjal-settings-main.c 
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
    14
 
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
    15
-evolution_settings_LDFLAGS = \
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
    16
-	-Wl,--export-dynamic
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
    17
+evolution_settings_LDFLAGS =
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
    18
 
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
    19
 if OS_WIN32
94e59b6e8dd9 2010-03-31 Jeff Cai <[email protected]>
qc161282
parents:
diff changeset
    20
 evolution_settings_LDFLAGS += -mwindows