aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2014-05-21 19:57:24 +0200
committerMattias Andrée <maandree@operamail.com>2014-05-21 19:57:24 +0200
commita178a7d7859137d457900dd1b03a76408f6a7ce5 (patch)
tree92427e8e70d2af8ff39f5be75a212f8b27be8d9b
parentmisc (diff)
downloadlibgamma-a178a7d7859137d457900dd1b03a76408f6a7ce5.tar.gz
libgamma-a178a7d7859137d457900dd1b03a76408f6a7ce5.tar.bz2
libgamma-a178a7d7859137d457900dd1b03a76408f6a7ce5.tar.xz
misc
Signed-off-by: Mattias Andrée <maandree@operamail.com>
-rw-r--r--Makefile11
-rwxr-xr-xconfigure9
-rw-r--r--src/gamma-dummy.c2
-rw-r--r--src/gamma-linux-drm.c2
-rw-r--r--src/gamma-quartz-cg.c2
-rw-r--r--src/gamma-w32-gdi.c2
-rw-r--r--src/gamma-x-randr.c2
-rw-r--r--src/gamma-x-vidmode.c2
8 files changed, 21 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index ae4ad31..4b8ebb9 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,6 @@
# without any warranty.
-# Include configurations from `./configure`.
-include config.mk
-
-
# The package path prefix, if you want to install to another root, set DESTDIR to that root.
PREFIX ?= /usr
# The library path excluding prefix.
@@ -62,13 +58,18 @@ endif
C_FLAGS = $(OPTIMISE) $(WARN) -std=$(STD) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
-ftree-vrp -fstrict-aliasing -fipa-pure-const -fstack-usage \
-fstrict-overflow -funsafe-loop-optimizations -fno-builtin \
- $(DEBUG_FLAGS) $(DEFINITIONS)
+ $(DEBUG_FLAGS) $(DEFINITIONS) -DLIBGAMMA_CONFIG_H
# Object files for the library.
LIBOBJ = libgamma-facade
+# Include configurations from `./configure`.
+include config.mk
+
+
+
# Build rules.
.PHONY: all
diff --git a/configure b/configure
index e3683a3..1e92543 100755
--- a/configure
+++ b/configure
@@ -98,39 +98,47 @@ if [ ${fake_quartz} = 1 ]; then
fi
if [ ${enable_debug} = 1 ]; then
echo "DEBUG = y" >&3
+ echo 'DEBUG_FLAGS += -DDEBUG' >&3
have_debug='Yes'
fi
if [ ${enable_dummy} = 1 ]; then
+ echo 'LIBOBJ += gamma-dummy' >&3
echo 'DEFINITIONS += -DHAVE_GAMMA_METHOD_DUMMY' >&3
echo '#define HAVE_GAMMA_METHOD_DUMMY' >&4
have_dummy='Yes'
fi
if [ ${enable_randr} = 1 ]; then
+ echo 'LIBOBJ += gamma-x-randr' >&3
echo 'DEFINITIONS += -DHAVE_GAMMA_METHOD_X_RANDR' >&3
echo '#define HAVE_GAMMA_METHOD_X_RANDR' >&4
have_randr='Yes'
fi
if [ ${enable_vidmode} = 1 ]; then
+ echo 'LIBOBJ += gamma-x-vidmode' >&3
echo 'DEFINITIONS += -DHAVE_GAMMA_METHOD_X_VIDMODE' >&3
echo '#define HAVE_GAMMA_METHOD_X_VIDMODE' >&4
have_vidmode='Yes'
fi
if [ ${enable_drm} = 1 ]; then
+ echo 'LIBOBJ += gamma-linux-drm' >&3
echo 'DEFINITIONS += -DHAVE_GAMMA_METHOD_LINUX_DRM' >&3
echo '#define HAVE_GAMMA_METHOD_LINUX_DRM' >&4
have_drm='Yes'
fi
if [ ${enable_w32gdi} = 1 ]; then
+ echo 'LIBOBJ += gamma-w32-gdi' >&3
echo 'DEFINITIONS += -DHAVE_GAMMA_METHOD_W32_GDI' >&3
echo '#define HAVE_GAMMA_METHOD_W32_GDI' >&4
have_w32gdi='Yes'
fi
if [ ${enable_quartz} = 1 ]; then
+ echo 'LIBOBJ += gamma-quartz-cg' >&3
echo 'DEFINITIONS += -DHAVE_GAMMA_METHOD_QUARTZ_CORE_GRAPHICS' >&3
echo '#define HAVE_GAMMA_METHOD_QUARTZ_CORE_GRAPHICS' >&4
have_quartz='Yes'
fi
if [ ${fake_w32gdi} = 1 ]; then
+ echo 'LIBOBJ += fake-w32-gdi' >&3
echo 'DEFINITIONS += -FAKE_GAMMA_METHOD_W32_GDI' >&3
echo '#define FAKE_GAMMA_METHOD_W32_GDI' >&4
if [ ${enable_randr} = 1 ]; then
@@ -140,6 +148,7 @@ if [ ${fake_w32gdi} = 1 ]; then
fi
fi
if [ ${fake_quartz} = 1 ]; then
+ echo 'LIBOBJ += fake-quartz-cg' >&3
echo 'DEFINITIONS += -FAKE_GAMMA_METHOD_QUARTZ_CORE_GRAPHICS' >&3
echo '#define FAKE_GAMMA_METHOD_QUARTZ_CORE_GRAPHICS' >&4
if [ ${enable_randr} = 1 ]; then
diff --git a/src/gamma-dummy.c b/src/gamma-dummy.c
index 1732cf8..e7f1309 100644
--- a/src/gamma-dummy.c
+++ b/src/gamma-dummy.c
@@ -21,7 +21,7 @@
#include "gamma-dummy.h"
-#include "gamma-error.h"
+#include "libgamma-error.h"
/**
diff --git a/src/gamma-linux-drm.c b/src/gamma-linux-drm.c
index 74e23ba..f6b40a8 100644
--- a/src/gamma-linux-drm.c
+++ b/src/gamma-linux-drm.c
@@ -21,7 +21,7 @@
#include "gamma-linux-drm.h"
-#include "gamma-error.h"
+#include "libgamma-error.h"
/**
diff --git a/src/gamma-quartz-cg.c b/src/gamma-quartz-cg.c
index c6cd8b8..bb4e307 100644
--- a/src/gamma-quartz-cg.c
+++ b/src/gamma-quartz-cg.c
@@ -21,7 +21,7 @@
#include "gamma-quartz-cg.h"
-#include "gamma-error.h"
+#include "libgamma-error.h"
/**
diff --git a/src/gamma-w32-gdi.c b/src/gamma-w32-gdi.c
index 2561aeb..ac8592f 100644
--- a/src/gamma-w32-gdi.c
+++ b/src/gamma-w32-gdi.c
@@ -21,7 +21,7 @@
#include "gamma-w32-gdi.h"
-#include "gamma-error.h"
+#include "libgamma-error.h"
/**
diff --git a/src/gamma-x-randr.c b/src/gamma-x-randr.c
index 9426756..5338e07 100644
--- a/src/gamma-x-randr.c
+++ b/src/gamma-x-randr.c
@@ -21,7 +21,7 @@
#include "gamma-x-randr.h"
-#include "gamma-error.h"
+#include "libgamma-error.h"
/**
diff --git a/src/gamma-x-vidmode.c b/src/gamma-x-vidmode.c
index c1df905..739c386 100644
--- a/src/gamma-x-vidmode.c
+++ b/src/gamma-x-vidmode.c
@@ -21,7 +21,7 @@
#include "gamma-x-vidmode.h"
-#include "gamma-error.h"
+#include "libgamma-error.h"
/**