diff options
| -rw-r--r-- | Makefile.in | 18 | ||||
| -rw-r--r-- | auto.def | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in index 6d46535..29c226b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,9 +40,15 @@ SHOBJ_LDFLAGS ?= @SHOBJ_LDFLAGS@ @else SHOBJ_LDFLAGS ?= @SHOBJ_LDFLAGS_R@ @endif -AS_CFLAGS = @AS_CFLAGS@ -AS_CXXFLAGS = @AS_CFLAGS@ -AS_CPPFLAGS = @AS_CPPFLAGS@ +@if [get-define srcdir] ne "." +VPATH := @srcdir@ +AS_CFLAGS = -I@srcdir@ +AS_CXXFLAGS = -I@srcdir@ +@endif + +AS_CFLAGS += @AS_CFLAGS@ +AS_CXXFLAGS += @AS_CFLAGS@ +AS_CPPFLAGS += @AS_CPPFLAGS@ CFLAGS ?= @CFLAGS@ CXXFLAGS ?= @CXXFLAGS@ LDFLAGS = @LDFLAGS@ @@ -53,12 +59,6 @@ prefix ?= @prefix@ docdir = @docdir@ srcdir := @srcdir@ -AS_CPPFLAGS += -Wall -I. -@if [get-define srcdir] ne "." -AS_CPPFLAGS += -I@srcdir@ -VPATH := @srcdir@ -@endif - @if JIM_STATICLIB LIBJIM := libjim.a @else @@ -208,9 +208,9 @@ cc-check-types "long long" cc-check-sizeof int # Default optimisation -define-append AS_CPPFLAGS -O2 - -define-append AS_CPPFLAGS -D_GNU_SOURCE +define-append AS_CPPFLAGS -O2 -Wall -D_GNU_SOURCE +define-append AS_CFLAGS -I. +define-append AS_CXXFLAGS -I. # check, but don't add to -cflags cc-with {} { |