mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Prefer *our* `include/` files 

This fixes discrepancies in build results for VPATH builds.
merge-requests/1/head
Olaf Meeuwissen 2016-09-07 21:01:26 +09:00
rodzic 737977199c
commit 27a4da41b1
2 zmienionych plików z 17 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
lib/Makefile.am
Wyświetl plik

@ -7,5 +7,6 @@ AM_CPPFLAGS += -I. -I$(top_builddir)/include -I$(top_srcdir)/include
noinst_LTLIBRARIES = liblib.la
liblib_la_SOURCES = md5.c
liblib_la_LIBADD = $(LTALLOCA) $(LTLIBOBJS)
liblib_la_SOURCES = md5.c
liblib_la_CPPFLAGS = -I$(top_srcdir)/include
liblib_la_LIBADD = $(LTALLOCA) $(LTLIBOBJS)

20
lib/Makefile.in
Wyświetl plik

@ -80,10 +80,10 @@ build_triplet = @build@
host_triplet = @host@
subdir = lib
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/mkinstalldirs alloca.c vsyslog.c getenv.c \
isfdtype.c inet_pton.c getopt1.c usleep.c strcasestr.c \
syslog.c sleep.c sigprocmask.c strdup.c strsep.c inet_ntop.c \
snprintf.c getopt.c strndup.c $(top_srcdir)/depcomp
$(top_srcdir)/mkinstalldirs alloca.c getopt1.c inet_ntop.c \
usleep.c inet_pton.c vsyslog.c strndup.c syslog.c sleep.c \
snprintf.c strcasestr.c getopt.c isfdtype.c strsep.c getenv.c \
sigprocmask.c strdup.c $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
@ -103,7 +103,7 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
liblib_la_DEPENDENCIES = $(LTALLOCA) $(LTLIBOBJS)
am_liblib_la_OBJECTS = md5.lo
am_liblib_la_OBJECTS = liblib_la-md5.lo
liblib_la_OBJECTS = $(am_liblib_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@ -366,6 +366,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = liblib.la
liblib_la_SOURCES = md5.c
liblib_la_CPPFLAGS = -I$(top_srcdir)/include
liblib_la_LIBADD = $(LTALLOCA) $(LTLIBOBJS)
all: all-am
@ -439,7 +440,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/syslog.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/usleep.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vsyslog.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblib_la-md5.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@ -465,6 +466,13 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
liblib_la-md5.lo: md5.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblib_la-md5.lo -MD -MP -MF $(DEPDIR)/liblib_la-md5.Tpo -c -o liblib_la-md5.lo `test -f 'md5.c' || echo '$(srcdir)/'`md5.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblib_la-md5.Tpo $(DEPDIR)/liblib_la-md5.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md5.c' object='liblib_la-md5.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblib_la-md5.lo `test -f 'md5.c' || echo '$(srcdir)/'`md5.c
mostlyclean-libtool:
-rm -f *.lo