wmail: use CPPFLAGS.

This commit is contained in:
Jeremy Sowden 2019-06-07 09:52:05 +01:00 committed by Carlos R. Mafra
parent 1d1c7e63b1
commit 356b07a201
2 changed files with 13 additions and 11 deletions

View file

@ -51,16 +51,17 @@ AC_CHECK_LIB(dockapp, DAInitialize,,,$XLFLAGS $XLIBS)
dnl Enable Debugging?
AC_ARG_ENABLE(debug,
[ --enable-debug enable debugging ],, enable_debug=no)
[ --enable-debug enable debugging ],, enable_debug=no)
if test "$enable_debug" = yes; then
CFLAGS="$CFLAGS -Wall -g -DDEBUG"
CPPFLAGS="$CPPFLAGS -DDEBUG"
CFLAGS="$CFLAGS -Wall -g"
fi
dnl Use delt's pixmaps instead of the default ones?
AC_ARG_ENABLE(delt_xpms,
[ --enable-delt-xpms enable delt's pixmaps ],, enable_delt_xpms=no)
[ --enable-delt-xpms enable delt's pixmaps ],, enable_delt_xpms=no)
if test "$enable_delt_xpms" = yes; then
CFLAGS="$CFLAGS -DUSE_DELT_XPMS"
CPPFLAGS="$CPPFLAGS -DUSE_DELT_XPMS"
fi
AC_OUTPUT(Makefile src/Makefile)

View file

@ -3,23 +3,24 @@
# Makefile for wmail.
# Makes the wmail dockapp binary and cleans the directory, respectively.
LIBS = @LIBS@ @XLFLAGS@ @XLIBS@
CC = @CC@
CFLAGS = @CFLAGS@ @XCFLAGS@
LIBS = @LIBS@ @XLFLAGS@ @XLIBS@
CC = @CC@
CFLAGS = @CFLAGS@ @XCFLAGS@
CPPFLAGS = @CPPFLAGS@
default all target: wmail
wmail: wmail.o common.o config.o
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^ $(LIBS)
wmail.o: wmail.c common.h config.h xpm/main.xpm xpm/symbols.xpm xpm/numbers.xpm xpm/button.xpm xpm/chars.xpm
$(CC) $(CFLAGS) -o $@ -c $<
$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
common.o: common.c common.h
$(CC) $(CFLAGS) -o $@ -c $<
$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
config.o: config.c config.h common.h
$(CC) $(CFLAGS) -o $@ -c $<
$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
clean:
rm -f wmail core *.o *~