aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@linux.vnet.ibm.com>2011-03-11 13:17:06 +0100
committerThomas Huth <thuth@linux.vnet.ibm.com>2011-03-22 15:22:09 +0100
commitf2a224a584095057d8617683cd5e9a2e2b7a7cb2 (patch)
treef78774b99f832c91d66d3fdf5d64fc7baa774c67
parent0453b00574c0636e124a7d2e3560f0d45b775646 (diff)
downloadSLOF-f2a224a584095057d8617683cd5e9a2e2b7a7cb2.zip
SLOF-f2a224a584095057d8617683cd5e9a2e2b7a7cb2.tar.gz
SLOF-f2a224a584095057d8617683cd5e9a2e2b7a7cb2.tar.bz2
Do not override CFLAGS and LDFLAGS from main makefile.
CFLAGS and LDFLAGS are declared in make.rules already and should not be redefined in sub-folders. Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
-rw-r--r--clients/net-snk/libc/Makefile8
-rw-r--r--clients/net-snk/libc/socket/Makefile8
-rw-r--r--clients/net-snk/libc/time/Makefile8
3 files changed, 3 insertions, 21 deletions
diff --git a/clients/net-snk/libc/Makefile b/clients/net-snk/libc/Makefile
index 74c9ead..21e0edf 100644
--- a/clients/net-snk/libc/Makefile
+++ b/clients/net-snk/libc/Makefile
@@ -1,5 +1,5 @@
# *****************************************************************************
-# * Copyright (c) 2004, 2008 IBM Corporation
+# * Copyright (c) 2004, 2011 IBM Corporation
# * All rights reserved.
# * This program and the accompanying materials
# * are made available under the terms of the BSD License
@@ -18,12 +18,6 @@ endif
include $(TOP)/make.rules
-CFLAGS = -g -I$(TOP)/include -I$(LIBCMNDIR)/libc/include -O2 \
- -fno-builtin -ffreestanding -nostdinc -msoft-float -Wall \
- -fno-stack-protector
-
-LDFLAGS= -nostdlib
-
OBJS = sbrk.o io.o ioctl.o
OBJDIRS = socket/socket.o time/time.o
SUBDIRS = $(filter-out ./,$(dir $(OBJDIRS)))
diff --git a/clients/net-snk/libc/socket/Makefile b/clients/net-snk/libc/socket/Makefile
index a1c5039..cffa6b3 100644
--- a/clients/net-snk/libc/socket/Makefile
+++ b/clients/net-snk/libc/socket/Makefile
@@ -1,5 +1,5 @@
# *****************************************************************************
-# * Copyright (c) 2004, 2008 IBM Corporation
+# * Copyright (c) 2004, 2011 IBM Corporation
# * All rights reserved.
# * This program and the accompanying materials
# * are made available under the terms of the BSD License
@@ -18,12 +18,6 @@ endif
include $(TOP)/make.rules
-CFLAGS = -g -I$(TOP)/include -I$(LIBCMNDIR)/libc/include -O2 \
- -fno-builtin -ffreestanding -msoft-float -Wall \
- -fno-stack-protector
-LDFLAGS= -nostdlib
-
-
OBJS = send.o
diff --git a/clients/net-snk/libc/time/Makefile b/clients/net-snk/libc/time/Makefile
index 46b7d4e..072df55 100644
--- a/clients/net-snk/libc/time/Makefile
+++ b/clients/net-snk/libc/time/Makefile
@@ -1,5 +1,5 @@
# *****************************************************************************
-# * Copyright (c) 2004, 2008 IBM Corporation
+# * Copyright (c) 2004, 2011 IBM Corporation
# * All rights reserved.
# * This program and the accompanying materials
# * are made available under the terms of the BSD License
@@ -10,7 +10,6 @@
# * IBM Corporation - initial implementation
# ****************************************************************************/
-
ifndef TOP
TOP = $(shell while ! test -e make.rules; do cd .. ; done; pwd)
export TOP
@@ -19,11 +18,6 @@ endif
include $(TOP)/make.rules
-CFLAGS = -g -I$(TOP)/include -I$(LIBCMNDIR)/libc/include -O2 -msoft-float \
- -Wall -fno-builtin -ffreestanding -nostdinc -fno-stack-protector
-LDFLAGS= -nostdlib
-
-
OBJS = timer.o ftime.o