Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-10 18:23:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed -Wno-unused-result (not available under SL5) and added NEED_STRLCPY since Mac OSX has now its own implementation

Browse Source
This commit is contained in:
Stefan Ritt 2014-10-01 08:36:31 +02:00
parent e4420a3e2d
commit 3b860b286c
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@ -30,8 +30,8 @@ USE_KRB5 = 0
############################################################# #############################################################
# Default compilation flags unless stated otherwise. # Default compilation flags unless stated otherwise.
CFLAGS += -O3 -funroll-loops -fomit-frame-pointer -W -Wall -Wno-deprecated-declarations -Wno-unused-result CFLAGS += -O3 -funroll-loops -fomit-frame-pointer -W -Wall -Wno-deprecated-declarations
#CFLAGS += -g -funroll-loops -fomit-frame-pointer -W -Wall -Wno-deprecated-declarations -Wno-unused-result #CFLAGS += -g -funroll-loops -fomit-frame-pointer -W -Wall -Wno-deprecated-declarations
CC = gcc CC = gcc
IFLAGS = -kr -nut -i3 -l110 IFLAGS = -kr -nut -i3 -l110
@ -41,6 +41,9 @@ MXMLDIR = ../mxml
BINOWNER = bin BINOWNER = bin
BINGROUP = bin BINGROUP = bin
# Option to use our own implementation of strlcat, strlcpy
NEED_STRLCPY = 1
INSTALL = `which install` INSTALL = `which install`
RM = /bin/rm -f RM = /bin/rm -f
@ -66,6 +69,7 @@ ifeq ($(OSTYPE),darwin)
CC = cc CC = cc
BINOWNER = root BINOWNER = root
BINGROUP = admin BINGROUP = admin
NEED_STRLCPY =
endif endif
ifeq ($(OSTYPE),FreeBSD) ifeq ($(OSTYPE),FreeBSD)
@ -94,6 +98,10 @@ LIBS += -lkrb5
endif endif
endif endif
ifdef NEED_STRLCPY
LIBS += strlcpy.o
endif
WHOAMI = $(shell whoami) WHOAMI = $(shell whoami)
ifeq ($(WHOAMI),root) ifeq ($(WHOAMI),root)
BINFLAGS = -o ${BINOWNER} -g ${BINGROUP} BINFLAGS = -o ${BINOWNER} -g ${BINGROUP}
@ -120,14 +128,14 @@ mxml.o: $(MXMLDIR)/mxml.c $(MXMLDIR)/mxml.h
strlcpy.o: $(MXMLDIR)/strlcpy.c $(MXMLDIR)/strlcpy.h strlcpy.o: $(MXMLDIR)/strlcpy.c $(MXMLDIR)/strlcpy.h
$(CC) $(CFLAGS) -c -o strlcpy.o $(MXMLDIR)/strlcpy.c $(CC) $(CFLAGS) -c -o strlcpy.o $(MXMLDIR)/strlcpy.c
elogd: src/elogd.c regex.o crypt.o auth.o mxml.o strlcpy.o elogd: src/elogd.c regex.o crypt.o auth.o mxml.o
$(CC) $(CFLAGS) -o elogd src/elogd.c crypt.o auth.o regex.o mxml.o strlcpy.o $(LIBS) $(CC) $(CFLAGS) -o elogd src/elogd.c crypt.o auth.o regex.o mxml.o $(LIBS)
elog: src/elog.c crypt.o elog: src/elog.c crypt.o
$(CC) $(CFLAGS) -o elog src/elog.c crypt.o $(LIBS) $(CC) $(CFLAGS) -o elog src/elog.c crypt.o $(LIBS)
debug: src/elogd.c regex.o crypt.o auth.o mxml.o strlcpy.o debug: src/elogd.c regex.o crypt.o auth.o mxml.o
$(CC) -g $(CFLAGS) -o elogd src/elogd.c crypt.o auth.o regex.o mxml.o strlcpy.o $(LIBS) $(CC) -g $(CFLAGS) -o elogd src/elogd.c crypt.o auth.o regex.o mxml.o $(LIBS)
%: src/%.c %: src/%.c
$(CC) $(CFLAGS) -o $@ $< $(LIBS) $(CC) $(CFLAGS) -o $@ $< $(LIBS)