Added capbility to override CFLAGS from commandline.

This commit is contained in:
fritz 1997-03-24 01:34:43 +00:00
parent a7c103ba34
commit e4b959d13e
6 changed files with 36 additions and 17 deletions

View File

@ -1,11 +1,13 @@
# $Id: Makefile.in,v 1.3 1997/03/02 19:42:06 fritz Exp $ # $Id: Makefile.in,v 1.4 1997/03/24 01:34:46 fritz Exp $
# #
# Makefile for icnctrl # Makefile for icnctrl
# (C) 1997 Fritz Elfert # (C) 1997 Fritz Elfert
# #
# #
SHELL = /bin/sh SHELL = /bin/sh
CFLAGS = -Wall -O2 -I. @DEBUGVAR@ -I@KERNELDIR@drivers/isdn/icn CFLAGS = -Wall -O2
INCLUDES = -I. @DEBUGVAR@ -I@KERNELDIR@drivers/isdn/icn
DEFS =
LDFLAGS = -L../lib @LIBS@ LDFLAGS = -L../lib @LIBS@
PROGRAM = icnctrl PROGRAM = icnctrl
MODULES = icnctrl.o MODULES = icnctrl.o
@ -18,7 +20,7 @@ exec_prefix = @exec_prefix@
ifeq (../.config,$(wildcard ../.config)) ifeq (../.config,$(wildcard ../.config))
include ../.config include ../.config
ifeq ($(CONFIG_ICNCTRL_DEBUG),y) ifeq ($(CONFIG_ICNCTRL_DEBUG),y)
CFLAGS += -DDEBUGVAR DEFS += -DDEBUGVAR
endif endif
SBINDIR = $(CONFIG_SBINDIR) SBINDIR = $(CONFIG_SBINDIR)
mandir = $(CONFIG_MANDIR) mandir = $(CONFIG_MANDIR)
@ -32,6 +34,9 @@ CC = @CC@
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .c .o .SUFFIXES: .c .o
%.o: %.c
$(CC) $(CFLAGS) $(INCLUDES) $(DEFS) -c -o $@ $<
all: $(PROGRAM) all: $(PROGRAM)
config: config:
@ -44,7 +49,7 @@ config.status: configure
./config.status --recheck ./config.status --recheck
$(PROGRAM): $(MODULES) $(PROGRAM): $(MODULES)
$(CC) $(CFLAGS) $? $(LDFLAGS) -o $@ $(CC) $(CFLAGS) $(INCLUDES) $(DEFS) $? $(LDFLAGS) -o $@
install-man: $(PROGRAM).man install-man: $(PROGRAM).man
mkdir -p $(MAN8DIR) mkdir -p $(MAN8DIR)

View File

@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.2 1997/03/02 19:42:12 fritz Exp $ # $Id: Makefile.in,v 1.3 1997/03/24 01:34:43 fritz Exp $
# #
# Makefile for iMON # Makefile for iMON
# #
@ -7,7 +7,8 @@
# #
# #
SHELL = /bin/sh SHELL = /bin/sh
CFLAGS = -Wall -O2 -I. $(ISDN_INCLUDE) CFLAGS = -Wall -O2
INCLUDES = -I. $(ISDN_INCLUDE)
LDFLAGS = -L../lib @LIBS@ LDFLAGS = -L../lib @LIBS@
PROGRAM = imon PROGRAM = imon
MODULES = imon.o MODULES = imon.o
@ -32,6 +33,9 @@ CC = @CC@
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .c .o .SUFFIXES: .c .o
%.o: %.c
$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
all: $(PROGRAM) all: $(PROGRAM)
config: config:

View File

@ -28,8 +28,10 @@ endif
# USER CONFIGURATION AREA # USER CONFIGURATION AREA
###################################################################### ######################################################################
CFLAGS = -Wall -pipe -O6
DEFS =
ifndef _CC ifndef _CC
export _CC = gcc -g #-Wall -pipe -O6 export _CC = gcc
endif endif
CC = $(_CC) CC = $(_CC)
@ -42,16 +44,19 @@ export AVON = avon
ifdef LIBAREA ifdef LIBAREA
LIBDIR = areacode LIBDIR = areacode
LIB_AREA = $(LIBDIR)/areacode.o LIB_AREA = $(LIBDIR)/areacode.o
CFLAGS += -DLIBAREA DEFS += -DLIBAREA
else else
LIBDIR = avon LIBDIR = avon
LIB_AREA = $(LIBDIR)/createDB.o LIB_AREA = $(LIBDIR)/createDB.o
CFLAGS += -DAVON=\"$(AVON)\" DEFS += -DAVON=\"$(AVON)\"
endif endif
SUBDIRS = $(LIBDIR) SUBDIRS = $(LIBDIR)
CFLAGS += -I$(PREFIXDIR) DEFS += -I$(PREFIXDIR)
%.o: %.c
$(CC) $(CFLAGS) $(DEFS) -c -o $@ $<
all: libs libisdn.a all: libs libisdn.a
@ -61,7 +66,7 @@ libs:
depend dep: .depend depend dep: .depend
.depend: .depend:
$(CPP) -M $(CFLAGS) *.c >.depend $(CPP) -M $(CFLAGS) $(DEFS) *.c >.depend
set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i depend; done set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i depend; done
clean: clean:

View File

@ -1,11 +1,12 @@
# $Id: Makefile.in,v 1.2 1997/03/02 19:42:29 fritz Exp $ # $Id: Makefile.in,v 1.3 1997/03/24 01:34:54 fritz Exp $
# #
# Makefile for pcbitctl # Makefile for pcbitctl
# (C) 1997 Fritz Elfert # (C) 1997 Fritz Elfert
# #
# #
SHELL = /bin/sh SHELL = /bin/sh
CFLAGS = -Wall -Wstrict-prototypes -O2 -g -I. -DDEBUG -I@KERNELDIR@drivers/isdn/pcbit CFLAGS = -Wall -Wstrict-prototypes -O2 -g
INCLUDES = -I. -DDEBUG -I@KERNELDIR@drivers/isdn/pcbit
LDFLAGS = -L../lib @LIBS@ LDFLAGS = -L../lib @LIBS@
PROGRAM = pcbitctl PROGRAM = pcbitctl
MODULES = pcbitctl.o convhexbin.o MODULES = pcbitctl.o convhexbin.o
@ -28,6 +29,9 @@ CC = @CC@
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .c .o .SUFFIXES: .c .o
%.o: %.c
$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
all: $(PROGRAM) all: $(PROGRAM)
config: config:

View File

@ -4,6 +4,7 @@
# the original Makefile, it is called GNUmakefile. # the original Makefile, it is called GNUmakefile.
# #
EDEF=$(CFLAGS)
ifeq (../.config,$(wildcard ../.config)) ifeq (../.config,$(wildcard ../.config))
include ../.config include ../.config
MAN1DIROPT = MANDIR=$(CONFIG_MANDIR)/man1 MAN1DIROPT = MANDIR=$(CONFIG_MANDIR)/man1
@ -16,7 +17,7 @@ endif
all: xisdnload all: xisdnload
xisdnload: xisdnload:
$(MAKE) -f Makefile CFLAGS= ; MAKEFLAGS= ; $(MAKE) -f Makefile EXTRA_DEFINES="$(EDEF)"
config: config:
@cp Makefile.in GNUmakefile @cp Makefile.in GNUmakefile

View File

@ -9,7 +9,7 @@
# - executed commands must be owned by root # - executed commands must be owned by root
# and only writable by owner. # and only writable by owner.
# #
I4LU_DEFINES := -DPARANOIA_CHECK I4LU_DEFINES := $(CFLAGS) -DPARANOIA_CHECK -I.
ifeq (../.config,$(wildcard ../.config)) ifeq (../.config,$(wildcard ../.config))
include ../.config include ../.config
ifneq ($(CONFIG_XMONISDN_UPCMD),"") ifneq ($(CONFIG_XMONISDN_UPCMD),"")
@ -37,7 +37,7 @@ xmonisdn:
mkdir -p X11/bitmaps mkdir -p X11/bitmaps
cp netinactive netwaiting netactive \ cp netinactive netwaiting netactive \
netactiveout netstart netstop X11/bitmaps netactiveout netstart netstop X11/bitmaps
$(MAKE) -f Makefile EXTRA_DEFINES="$(I4LU_DEFINES) -I." CFLAGS= ; MAKEFLAGS= ; $(MAKE) -f Makefile EXTRA_DEFINES="$(I4LU_DEFINES)"
rm -rf X11 rm -rf X11
config: config: