faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge CCWARNFLAGS with CFLAGS

Browse source
This commit is contained in:
Miroslav Lichvar 2011-05-23 17:57:28 +02:00
parent da2c8d9076
commit 18605795a7
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile.in
View file

@ -29,8 +29,7 @@ INFODIR=@INFODIR@
DOCDIR=@DOCDIR@ DOCDIR=@DOCDIR@
CC = @CC@ CC = @CC@
CCWARNFLAGS = @CCWARNFLAGS@ CFLAGS = @CFLAGS@
OPTFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
DESTDIR= DESTDIR=
@ -62,18 +61,16 @@ LIBS = @LIBS@
EXTRA_LIBS=@EXTRA_LIBS@ EXTRA_LIBS=@EXTRA_LIBS@
EXTRA_CLI_LIBS=@EXTRA_CLI_LIBS@ EXTRA_CLI_LIBS=@EXTRA_CLI_LIBS@
CFLAGS = $(CCWARNFLAGS) $(OPTFLAGS)
# Until we have a main procedure we can link, just build object files # Until we have a main procedure we can link, just build object files
# to test compilation # to test compilation
all : chronyd chronyc all : chronyd chronyc
chronyd : $(OBJS) $(EXTRA_OBJS) chronyd : $(OBJS) $(EXTRA_OBJS)
$(CC) $(OPTFLAGS) -o chronyd $(OBJS) $(EXTRA_OBJS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(CC) $(CFLAGS) -o chronyd $(OBJS) $(EXTRA_OBJS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS)
chronyc : $(CLI_OBJS) chronyc : $(CLI_OBJS)
$(CC) $(OPTFLAGS) -o chronyc $(CLI_OBJS) $(LDFLAGS) @READLINE_LINK@ $(LIBS) $(EXTRA_CLI_LIBS) $(CC) $(CFLAGS) -o chronyc $(CLI_OBJS) $(LDFLAGS) @READLINE_LINK@ $(LIBS) $(EXTRA_CLI_LIBS)
client.o : client.c client.o : client.c
$(CC) $(CFLAGS) $(CPPFLAGS) @READLINE_COMPILE@ -c $< $(CC) $(CFLAGS) $(CPPFLAGS) @READLINE_COMPILE@ -c $<

5
configure vendored
View file

@ -27,9 +27,7 @@ fi
MYCPPFLAGS="${CPPFLAGS}" MYCPPFLAGS="${CPPFLAGS}"
if [ "x${MYCC}" = "xgcc" ]; then if [ "x${MYCC}" = "xgcc" ]; then
CCWARNFLAGS="-Wmissing-prototypes -Wall" MYCFLAGS="${MYCFLAGS} -Wmissing-prototypes -Wall"
else
CCWARNFLAGS=""
fi fi
MYLDFLAGS="${LDFLAGS}" MYLDFLAGS="${LDFLAGS}"
@ -497,7 +495,6 @@ add_def DEFAULT_CONF_DIR "\"$SYSCONFDIR\""
sed -e "s%@EXTRA_OBJECTS@%${EXTRA_OBJECTS}%;\ sed -e "s%@EXTRA_OBJECTS@%${EXTRA_OBJECTS}%;\
s%@CC@%${MYCC}%;\ s%@CC@%${MYCC}%;\
s%@CFLAGS@%${MYCFLAGS}%;\ s%@CFLAGS@%${MYCFLAGS}%;\
s%@CCWARNFLAGS@%${CCWARNFLAGS}%;\
s%@CPPFLAGS@%${CPPFLAGS}%;\ s%@CPPFLAGS@%${CPPFLAGS}%;\
s%@LIBS@%${LIBS}%;\ s%@LIBS@%${LIBS}%;\
s%@LDFLAGS@%${MYLDFLAGS}%;\ s%@LDFLAGS@%${MYLDFLAGS}%;\