mirror of
https://github.com/samba-team/samba.git
synced 2024-12-25 23:21:54 +03:00
r22598: Simplify includes for replace.
(This used to be commit e72cec408e
)
This commit is contained in:
parent
201408141d
commit
2ea1896591
@ -28,7 +28,7 @@ POPT_LIBS = @POPT_LIBS@
|
|||||||
POPT_CFLAGS = @POPT_CFLAGS@
|
POPT_CFLAGS = @POPT_CFLAGS@
|
||||||
|
|
||||||
CFLAGS=-g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \
|
CFLAGS=-g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \
|
||||||
$(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) -I@libreplacedir@ \
|
$(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) \
|
||||||
-DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"@SHLIBEXT@\" -DUSE_MMAP=1 @CFLAGS@
|
-DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"@SHLIBEXT@\" -DUSE_MMAP=1 @CFLAGS@
|
||||||
|
|
||||||
LIB_FLAGS=@LDFLAGS@ -Llib -lldb @LIBS@ $(POPT_LIBS)
|
LIB_FLAGS=@LDFLAGS@ -Llib -lldb @LIBS@ $(POPT_LIBS)
|
||||||
|
@ -11,9 +11,9 @@ srcdir = @srcdir@
|
|||||||
builddir = @builddir@
|
builddir = @builddir@
|
||||||
INSTALL = @INSTALL@
|
INSTALL = @INSTALL@
|
||||||
|
|
||||||
.PHONY: test
|
.PHONY: test all showflags install installcheck clean distclean realdistclean
|
||||||
|
|
||||||
CFLAGS=-I. -I@libreplacedir@ @CFLAGS@
|
CFLAGS=-I. @CFLAGS@
|
||||||
|
|
||||||
OBJS = @LIBREPLACEOBJ@
|
OBJS = @LIBREPLACEOBJ@
|
||||||
|
|
||||||
|
@ -354,6 +354,7 @@ AC_LIBREPLACE_LOCATION_CHECKS
|
|||||||
AC_LIBREPLACE_CC_CHECKS
|
AC_LIBREPLACE_CC_CHECKS
|
||||||
AC_LIBREPLACE_BROKEN_CHECKS
|
AC_LIBREPLACE_BROKEN_CHECKS
|
||||||
AC__LIBREPLACE_ALL_CHECKS_END
|
AC__LIBREPLACE_ALL_CHECKS_END
|
||||||
|
CFLAGS="$CFLAGS -I$libreplacedir"
|
||||||
])
|
])
|
||||||
|
|
||||||
m4_include(libreplace_cc.m4)
|
m4_include(libreplace_cc.m4)
|
||||||
|
@ -12,7 +12,7 @@ builddir = @builddir@
|
|||||||
XSLTPROC = @XSLTPROC@
|
XSLTPROC = @XSLTPROC@
|
||||||
INSTALLCMD = @INSTALL@
|
INSTALLCMD = @INSTALL@
|
||||||
CC = @CC@
|
CC = @CC@
|
||||||
CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I@srcdir@ -I@libreplacedir@
|
CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I@srcdir@
|
||||||
EXTRA_TARGETS = @DOC_TARGET@
|
EXTRA_TARGETS = @DOC_TARGET@
|
||||||
|
|
||||||
.SUFFIXES: .c .o .3 .3.xml .xml .html
|
.SUFFIXES: .c .o .3 .3.xml .xml .html
|
||||||
|
@ -12,7 +12,7 @@ libdir = @libdir@
|
|||||||
VPATH = @srcdir@:@libreplacedir@
|
VPATH = @srcdir@:@libreplacedir@
|
||||||
srcdir = @srcdir@
|
srcdir = @srcdir@
|
||||||
builddir = @builddir@
|
builddir = @builddir@
|
||||||
CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -Iinclude -I@libreplacedir@
|
CPPFLAGS = @CPPFLAGS@ -I$(srcdir)/include -Iinclude
|
||||||
CFLAGS = $(CPPFLAGS) @CFLAGS@
|
CFLAGS = $(CPPFLAGS) @CFLAGS@
|
||||||
LDFLAGS = @LDFLAGS@
|
LDFLAGS = @LDFLAGS@
|
||||||
EXEEXT = @EXEEXT@
|
EXEEXT = @EXEEXT@
|
||||||
|
Loading…
Reference in New Issue
Block a user