blob: 9179585974c2bae2fedba7225345d8139c5ca1ca (
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
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
From 08bdf5f5d0c64384b2be16bd8ac68244675388d5 Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@gentoo.org>
Date: Sun, 6 Oct 2013 21:13:51 +0200
Subject: [PATCH] respect CFLAGS
---
Makefile.am | 2 +-
configure.ac | 2 +-
rw/Makefile.am | 2 +-
rw/configure.ac | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 4cf1753..414597f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ EXTERN_VIEWER = display
## -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
## -DFUNCPROTO=15 -DNARROWPROTO
-ARCH_DEFINES = -g -O2 -fno-strict-aliasing -fPIC
+ARCH_DEFINES = -fno-strict-aliasing -fPIC
##
## Specific xpaint options
diff --git a/configure.ac b/configure.ac
index e058529..3979075 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_TYPE_UINT16_T
AC_TYPE_UINT32_T
AC_TYPE_UINT64_T
-CFLAGS="-I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft"
+CFLAGS="$CFLAGS -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft"
LIBS="$LIBS -lm"
echo "VERSION = $VERSION" > .version
diff --git a/rw/Makefile.am b/rw/Makefile.am
index d91d5d5..2f50253 100644
--- a/rw/Makefile.am
+++ b/rw/Makefile.am
@@ -10,7 +10,7 @@ SHAREDIR = $(prefix)/share/xpaint
## -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
## -DFUNCPROTO=15 -DNARROWPROTO
-ARCH_DEFINES = -g -O2 -fno-strict-aliasing -fPIC
+ARCH_DEFINES = -fno-strict-aliasing -fPIC
##
## Specific xpaint options
diff --git a/rw/configure.ac b/rw/configure.ac
index fb4f3d4..d9c7601 100644
--- a/rw/configure.ac
+++ b/rw/configure.ac
@@ -29,7 +29,7 @@ AC_TYPE_UINT16_T
AC_TYPE_UINT32_T
AC_TYPE_UINT64_T
-CFLAGS="-D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFUNCPROTO=15 -DNARROWPROTO -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft"
+CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFUNCPROTO=15 -DNARROWPROTO -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft"
LIBS="$LIBS -lm"
dnl check X11
--
1.8.3.2
|
