Change build to pass through CPPFLAGS if provided, and to use the DEFS value set by configure.
The DEFS Makefile variable has been renamed to CPPFLAGS, and is now set based on the CPPFLAGS, INCLUDES and DEFS values provided by configure. Reported by cpet, this allows the FreeBSD port to drop a patch. git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@519 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
@@ -35,7 +35,7 @@ INSTALL_IRC = @INSTALL_IRC@
|
||||
IRCLIB = @IRCLIB@
|
||||
|
||||
CC = @CC@
|
||||
DEFS = @INCLUDES@
|
||||
CPPFLAGS = @CPPFLAGS@ @INCLUDES@ @DEFS@
|
||||
LIBS = @LIBS@
|
||||
|
||||
# Tcl library.
|
||||
@@ -165,7 +165,7 @@ Makefile: Makefile.in
|
||||
&& ./config.status
|
||||
|
||||
europa.o: $(srcdir)/europa.c
|
||||
$(CC) $(DEFS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/europa.c
|
||||
$(CC) $(CPPFLAGS) $(SHLIB_CFLAGS) $(CFLAGS) -c $(srcdir)/europa.c
|
||||
|
||||
europa$(SHLIB_SUFFIX): europa.o ../dllinit.o
|
||||
$(SHLIB_LD) europa.o ../dllinit.o $(SHLIB_CFLAGS) -o europa$(SHLIB_SUFFIX) $(MYSQL_LIBS)
|
||||
|
||||
Reference in New Issue
Block a user