ARCH variable set correctly

FossilOrigin-Name: 93cc227d78e3382000f6d6fdf512056d2e47f6a4737a94380fc6da9a9047e422
This commit is contained in:
tobias.herre@wikimedia.de 2018-03-20 10:57:44 +00:00
parent 9ee3decdfe
commit 7128df99a3
9 changed files with 13 additions and 9 deletions

5
src/Defs.mak Normal file
View File

@ -0,0 +1,5 @@
ifndef ARCH
ARCH = $(shell uname -m)
endif

View File

@ -18,11 +18,6 @@ GNUTLS_LDFLAGS=
endif
ifndef ARCH
ARCH = $(shell uname -m)
endif
ifeq ($(CC),clang)
LDFLAGS += -g -L/usr/local/lib
CFLAGS += -fPIC -g -O0 -D_REENTRANT -I /usr/local/include -I../

View File

@ -1,3 +1,5 @@
include ../Defs.mak
include ../Config.mak
include ../ACConfig.mak
-include ../Config.local.mak

View File

@ -1,3 +1,4 @@
include ../Defs.mak
include ../CWConfig.mak
-include ../Config.local.mak
include ../Macros.mak

View File

@ -1,5 +1,5 @@
#include "capwap.h"
#include "cw.h"
int cw_addelem_cisco_wtp_radio_cfg(uint8_t*dst,struct radioinfo *ri)
{

View File

@ -23,12 +23,12 @@ $(OBJDIR)/%.o:%.c
$(SNAME) : $(OBJS) $(MODOBJS)
@mkdir -p $(LIBARCHDIR)
@echo " $(AR) $(SNAME)"
@$(AR) rcs $(SNAME) $(OBJS) $(MODOBJS)
$(AR) rcs $(SNAME) $(OBJS) $(MODOBJS)
$(DNAME) : $(OBJS) $(MODOBJS)
@mkdir -p $(LIBARCHDIR)
@echo " $(CC) $(DNAME)"
@$(LD) -L$(LIBARCHDIR) $(LDFLAGS) -shared -o $(DNAME) $(OBJS) $(MODOBJS) $(SLIBS) $(LIBS)
$(LD) -L$(LIBARCHDIR) $(LDFLAGS) -shared -o $(DNAME) $(OBJS) $(MODOBJS) $(SLIBS) $(LIBS)
$(MODNAME) : $(DNAME)
cp $(DNAME) $(MODNAME)

View File

@ -1,4 +1,4 @@
include ../../Defs.mak
OBJS=\

View File

@ -1,3 +1,4 @@
include ../Defs.mak
include ../Config.mak
include ../WtpConfig.mak
-include ../Config.local.mak