summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2008-02-12 21:28:55 -0800
committerAaron Plattner <aplattner@nvidia.com>2008-02-12 21:28:55 -0800
commit9cec52adf6e908620eeb819927b7395734e47f09 (patch)
treeb44fae751b5b6b4e4d21ed8f4dd54effbb2aa378 /Makefile
parent03dfb75016524ca18b3cf5cc71a60163150983d7 (diff)
1.0-87561.0-8756
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile26
1 files changed, 17 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index b3fd621..722d011 100644
--- a/Makefile
+++ b/Makefile
@@ -50,10 +50,6 @@ ifndef CC
CC = gcc
endif
-ifndef CFLAGS
- CFLAGS = -Wall
-endif
-
ifndef PKG_CONFIG
PKG_CONFIG = pkg-config
endif
@@ -70,16 +66,20 @@ ifndef X11R6_INC_DIR
X11R6_INC_DIR = /usr/X11R6/include
endif
+# define local variables
+
+LOCAL_CFLAGS = -Wall
+
# the NVDEBUG environment variable controls whether we build debug or retail
ifeq ($(NVDEBUG),1)
STRIP = true
- CFLAGS += -g -DDEBUG
+ LOCAL_CFLAGS += -g -DDEBUG
else
ifndef STRIP
STRIP = strip
endif
- CFLAGS += -O
+ LOCAL_CFLAGS += -O -DNDEBUG
endif
# default prefix
@@ -137,7 +137,7 @@ SRCDIRS := $(addprefix $(CURDIR)/, $(RELATIVE_SRCDIRS))
INC_FLAGS := $(addprefix -I , $(RELATIVE_SRCDIRS))
-ALL_CFLAGS = $(CFLAGS) $(X11R6_CFLAGS) $(GTK_CFLAGS) $(INC_FLAGS)
+ALL_CFLAGS = $(CFLAGS) $(LOCAL_CFLAGS) $(X11R6_CFLAGS) $(GTK_CFLAGS) $(INC_FLAGS)
ALL_LDFLAGS = $(LD_RUN_FLAG) $(LDFLAGS) $(GTK_LDFLAGS) $(X11R6_LIBS)
CPPFLAGS = $(ALL_CFLAGS)
@@ -156,8 +156,16 @@ MANPAGE = nvidia-settings.1
# Define the files in the SAMPLES directory
-SAMPLES = Makefile README nv-control-dvc.c nv-control-info.c \
- nv-control-events.c nv-ddcci-client.c
+SAMPLES = \
+ Makefile \
+ nv-control-dpy.c \
+ nv-control-dvc.c \
+ nv-control-events.c \
+ nv-control-info.c \
+ nv-control-targets.c \
+ nv-ddcci-client.c \
+ nv-control-framelock.c \
+ README
# initialize SRC and EXTRA_DIST, then include each of the subdirectory
# Makefiles so that they can append to SRC and EXTRA_DIST