diff options
| author | Eric Christopher <echristo@apple.com> | 2005-10-20 19:46:34 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@apple.com> | 2005-10-20 19:46:34 +0000 |
| commit | 8e5abdeeb93ac991bc72f72d9d01ac679e420969 (patch) | |
| tree | 8a5818a7dd756bdb47fe3dd951aa2a91e930d150 | |
| parent | a485fbdd37d213aa81bbfc31ff411264d322252e (diff) | |
| download | nasm-8e5abdeeb93ac991bc72f72d9d01ac679e420969.tar.gz | |
Allow CFLAGS to be overridden from make.
| -rw-r--r-- | Makefile.in | 15 | ||||
| -rw-r--r-- | rdoff/Makefile.in | 7 |
2 files changed, 14 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 7d242af6..978e7c5f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,7 +15,10 @@ bindir = @bindir@ mandir = @mandir@ CC = @CC@ -CFLAGS = @CFLAGS@ @GCCFLAGS@ @DEFS@ -I$(srcdir) -I. +CFLAGS = @CFLAGS@ +BUILD_CFLAGS = $(CFLAGS) @GCCFLAGS@ @DEFS@ +INTERNAL_CFLAGS = -I$(srcdir) -I. +ALL_CFLAGS = $(BUILD_CFLAGS) $(INTERNAL_CFLAGS) LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ PERL = perl @@ -36,13 +39,13 @@ X = @EXEEXT@ .PHONY: install_doc everything install_everything strip perlreq dist .c.$(O): - $(CC) -c $(CFLAGS) -o $@ $< + $(CC) -c $(ALL_CFLAGS) -o $@ $< .c.s: - $(CC) -S $(CFLAGS) -o $@ $< + $(CC) -S $(ALL_CFLAGS) -o $@ $< .c.i: - $(CC) -E $(CFLAGS) -o $@ $< + $(CC) -E $(ALL_CFLAGS) -o $@ $< .1.man: $(NROFF) -man $< > $@ @@ -111,7 +114,7 @@ regs.h: regs.dat regs.pl # This allows easier generation of distribution (see dist target). PERLREQ = macros.c insnsa.c insnsd.c insnsi.h insnsn.c \ regs.c regs.h regflags.c regdis.c regvals.c \ - version.h version.mac + version.h version.mac perlreq: $(PERLREQ) install: nasm$(X) ndisasm$(X) @@ -175,7 +178,7 @@ nasm.spec: nasm.spec.in version version.pl -e s/@@ID@@/`$(PERL) $(srcdir)/version.pl id < $(srcdir)/version`/g \ < nasm.spec.in > nasm.spec -splint: +splint: splint -weak *.c # diff --git a/rdoff/Makefile.in b/rdoff/Makefile.in index f2e14f4d..d4f0a70a 100644 --- a/rdoff/Makefile.in +++ b/rdoff/Makefile.in @@ -17,7 +17,10 @@ bindir = @bindir@ mandir = @mandir@ CC = @CC@ -CFLAGS = @CFLAGS@ @GCCFLAGS@ -I$(srcdir) -I$(top_srcdir) +CFLAGS = @CFLAGS@ +BUILD_CFLAGS = $(CFLAGS) @GCCFLAGS@ @DEFS@ +INTERNAL_CFLAGS = -I$(srcdir) -I$(top_srcdir) +ALL_CFLAGS = $(BUILD_CFLAGS) $(INTERNAL_CFLAGS) LDFLAGS = @LDFLAGS@ INSTALL = @INSTALL@ @@ -38,7 +41,7 @@ PROGRAMS = rdfdump$(X) ldrdf$(X) rdx$(X) rdflib$(X) \ .SUFFIXES: .c .i .s .$(O) .1 .man .c.$(O): - $(CC) -c $(CFLAGS) $< + $(CC) -c $(ALL_CFLAGS) $< all: $(PROGRAMS) |