Skip to content

Commit

Permalink
Fixed bad Makefile.
Browse files Browse the repository at this point in the history
  • Loading branch information
Marshall Lee Whittaker committed Mar 20, 2016
1 parent 7388d2f commit 9a841f7
Show file tree
Hide file tree
Showing 25 changed files with 3,825 additions and 2,796 deletions.
164 changes: 98 additions & 66 deletions Makefile
View file

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@ AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
bin_PROGRAMS = ansvif find_suid faulty
noinst_LIBRARIES = libgzstream.a
libgzstream_a_SOURCES = includes/gzstream/gzstream.h
ansvif_SOURCES = src/common.cpp src/linux/bin2hex.cpp src/linux/popen2.cpp src/linux/main.cpp src/linux/help.cpp src/match_seg.cpp src/linux/sys_string.cpp src/linux/man_read.cpp
ansvif_LDADD = -lstdc++ -lgzstream -lz -lpthread -L./include/gzstream
#gzstream_SOURCES = include/gzstream/gzstream.C
libgzstream_a_SOURCES = include/gzstream/gzstream.h include/gzstream/gzstream.C
ansvif_SOURCES = src/common.cpp src/linux/bin2hex.cpp src/linux/popen2.cpp src/linux/main.cpp src/linux/help.cpp src/match_seg.cpp src/linux/sys_string.cpp src/linux/man_read.cpp include/gzstream/gzstream.h
ansvif_LDADD = -lgzstream -lstdc++ -lpthread -lz -L.
ansvif_CPPFLAGS = -O3
ansvif_LDFLAGS = -I./include/gzstream
find_suid_SOURCES = src/linux/find_suid.cpp
faulty_SOURCES = src/faulty.c
faulty_CFLAGS = -ansi
ansvifdir = bin
AM_CXXFLAGS = -Wall

138 changes: 85 additions & 53 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ am__v_AR_0 = @echo " AR " $@;
am__v_AR_1 =
libgzstream_a_AR = $(AR) $(ARFLAGS)
libgzstream_a_LIBADD =
am_libgzstream_a_OBJECTS =
am__dirstamp = $(am__leading_dot)dirstamp
am_libgzstream_a_OBJECTS = include/gzstream/gzstream.$(OBJEXT)
libgzstream_a_OBJECTS = $(am_libgzstream_a_OBJECTS)
am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
am__dirstamp = $(am__leading_dot)dirstamp
am_ansvif_OBJECTS = src/ansvif-common.$(OBJEXT) \
src/linux/ansvif-bin2hex.$(OBJEXT) \
src/linux/ansvif-popen2.$(OBJEXT) \
Expand All @@ -114,6 +114,8 @@ am_ansvif_OBJECTS = src/ansvif-common.$(OBJEXT) \
src/linux/ansvif-man_read.$(OBJEXT)
ansvif_OBJECTS = $(am_ansvif_OBJECTS)
ansvif_DEPENDENCIES =
ansvif_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(ansvif_LDFLAGS) \
$(LDFLAGS) -o $@
am_faulty_OBJECTS = src/faulty-faulty.$(OBJEXT)
faulty_OBJECTS = $(am_faulty_OBJECTS)
faulty_LDADD = $(LDADD)
Expand Down Expand Up @@ -142,18 +144,6 @@ AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
AM_V_CXX = $(am__v_CXX_@AM_V@)
Expand All @@ -167,6 +157,18 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(libgzstream_a_SOURCES) $(ansvif_SOURCES) $(faulty_SOURCES) \
$(find_suid_SOURCES)
DIST_SOURCES = $(libgzstream_a_SOURCES) $(ansvif_SOURCES) \
Expand Down Expand Up @@ -310,10 +312,12 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
noinst_LIBRARIES = libgzstream.a
libgzstream_a_SOURCES = includes/gzstream/gzstream.h
ansvif_SOURCES = src/common.cpp src/linux/bin2hex.cpp src/linux/popen2.cpp src/linux/main.cpp src/linux/help.cpp src/match_seg.cpp src/linux/sys_string.cpp src/linux/man_read.cpp
ansvif_LDADD = -lstdc++ -lgzstream -lz -lpthread -L./include/gzstream
#gzstream_SOURCES = include/gzstream/gzstream.C
libgzstream_a_SOURCES = include/gzstream/gzstream.h include/gzstream/gzstream.C
ansvif_SOURCES = src/common.cpp src/linux/bin2hex.cpp src/linux/popen2.cpp src/linux/main.cpp src/linux/help.cpp src/match_seg.cpp src/linux/sys_string.cpp src/linux/man_read.cpp include/gzstream/gzstream.h
ansvif_LDADD = -lgzstream -lstdc++ -lpthread -lz -L.
ansvif_CPPFLAGS = -O3
ansvif_LDFLAGS = -I./include/gzstream
find_suid_SOURCES = src/linux/find_suid.cpp
faulty_SOURCES = src/faulty.c
faulty_CFLAGS = -ansi
Expand All @@ -322,7 +326,7 @@ AM_CXXFLAGS = -Wall
all: all-am

.SUFFIXES:
.SUFFIXES: .c .cpp .o .obj
.SUFFIXES: .C .c .cpp .o .obj
am--refresh: Makefile
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
Expand Down Expand Up @@ -360,6 +364,14 @@ $(am__aclocal_m4_deps):

clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
include/gzstream/$(am__dirstamp):
@$(MKDIR_P) include/gzstream
@: > include/gzstream/$(am__dirstamp)
include/gzstream/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) include/gzstream/$(DEPDIR)
@: > include/gzstream/$(DEPDIR)/$(am__dirstamp)
include/gzstream/gzstream.$(OBJEXT): include/gzstream/$(am__dirstamp) \
include/gzstream/$(DEPDIR)/$(am__dirstamp)

libgzstream.a: $(libgzstream_a_OBJECTS) $(libgzstream_a_DEPENDENCIES) $(EXTRA_libgzstream_a_DEPENDENCIES)
$(AM_V_at)-rm -f libgzstream.a
Expand Down Expand Up @@ -438,7 +450,7 @@ src/linux/ansvif-man_read.$(OBJEXT): src/linux/$(am__dirstamp) \

ansvif$(EXEEXT): $(ansvif_OBJECTS) $(ansvif_DEPENDENCIES) $(EXTRA_ansvif_DEPENDENCIES)
@rm -f ansvif$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(ansvif_OBJECTS) $(ansvif_LDADD) $(LIBS)
$(AM_V_CXXLD)$(ansvif_LINK) $(ansvif_OBJECTS) $(ansvif_LDADD) $(LIBS)
src/faulty-faulty.$(OBJEXT): src/$(am__dirstamp) \
src/$(DEPDIR)/$(am__dirstamp)

Expand All @@ -454,12 +466,14 @@ find_suid$(EXEEXT): $(find_suid_OBJECTS) $(find_suid_DEPENDENCIES) $(EXTRA_find_

mostlyclean-compile:
-rm -f *.$(OBJEXT)
-rm -f include/gzstream/*.$(OBJEXT)
-rm -f src/*.$(OBJEXT)
-rm -f src/linux/*.$(OBJEXT)

distclean-compile:
-rm -f *.tab.c

@AMDEP_TRUE@@am__include@ @am__quote@include/gzstream/$(DEPDIR)/gzstream.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ansvif-common.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ansvif-match_seg.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/faulty-faulty.Po@am__quote@
Expand All @@ -471,45 +485,15 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@src/linux/$(DEPDIR)/ansvif-sys_string.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@src/linux/$(DEPDIR)/find_suid.Po@am__quote@

.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<

.c.obj:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

src/faulty-faulty.o: src/faulty.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(faulty_CFLAGS) $(CFLAGS) -MT src/faulty-faulty.o -MD -MP -MF src/$(DEPDIR)/faulty-faulty.Tpo -c -o src/faulty-faulty.o `test -f 'src/faulty.c' || echo '$(srcdir)/'`src/faulty.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/faulty-faulty.Tpo src/$(DEPDIR)/faulty-faulty.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/faulty.c' object='src/faulty-faulty.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(faulty_CFLAGS) $(CFLAGS) -c -o src/faulty-faulty.o `test -f 'src/faulty.c' || echo '$(srcdir)/'`src/faulty.c

src/faulty-faulty.obj: src/faulty.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(faulty_CFLAGS) $(CFLAGS) -MT src/faulty-faulty.obj -MD -MP -MF src/$(DEPDIR)/faulty-faulty.Tpo -c -o src/faulty-faulty.obj `if test -f 'src/faulty.c'; then $(CYGPATH_W) 'src/faulty.c'; else $(CYGPATH_W) '$(srcdir)/src/faulty.c'; fi`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/faulty-faulty.Tpo src/$(DEPDIR)/faulty-faulty.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/faulty.c' object='src/faulty-faulty.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(faulty_CFLAGS) $(CFLAGS) -c -o src/faulty-faulty.obj `if test -f 'src/faulty.c'; then $(CYGPATH_W) 'src/faulty.c'; else $(CYGPATH_W) '$(srcdir)/src/faulty.c'; fi`

.cpp.o:
.C.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<

.cpp.obj:
.C.obj:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
Expand Down Expand Up @@ -629,6 +613,52 @@ src/linux/ansvif-man_read.obj: src/linux/man_read.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ansvif_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/linux/ansvif-man_read.obj `if test -f 'src/linux/man_read.cpp'; then $(CYGPATH_W) 'src/linux/man_read.cpp'; else $(CYGPATH_W) '$(srcdir)/src/linux/man_read.cpp'; fi`

.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<

.c.obj:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

src/faulty-faulty.o: src/faulty.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(faulty_CFLAGS) $(CFLAGS) -MT src/faulty-faulty.o -MD -MP -MF src/$(DEPDIR)/faulty-faulty.Tpo -c -o src/faulty-faulty.o `test -f 'src/faulty.c' || echo '$(srcdir)/'`src/faulty.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/faulty-faulty.Tpo src/$(DEPDIR)/faulty-faulty.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/faulty.c' object='src/faulty-faulty.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(faulty_CFLAGS) $(CFLAGS) -c -o src/faulty-faulty.o `test -f 'src/faulty.c' || echo '$(srcdir)/'`src/faulty.c

src/faulty-faulty.obj: src/faulty.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(faulty_CFLAGS) $(CFLAGS) -MT src/faulty-faulty.obj -MD -MP -MF src/$(DEPDIR)/faulty-faulty.Tpo -c -o src/faulty-faulty.obj `if test -f 'src/faulty.c'; then $(CYGPATH_W) 'src/faulty.c'; else $(CYGPATH_W) '$(srcdir)/src/faulty.c'; fi`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/faulty-faulty.Tpo src/$(DEPDIR)/faulty-faulty.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/faulty.c' object='src/faulty-faulty.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(faulty_CFLAGS) $(CFLAGS) -c -o src/faulty-faulty.obj `if test -f 'src/faulty.c'; then $(CYGPATH_W) 'src/faulty.c'; else $(CYGPATH_W) '$(srcdir)/src/faulty.c'; fi`

.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<

.cpp.obj:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

ID: $(am__tagged_files)
$(am__define_uniq_tagged_files); mkid -fID $$unique
tags: tags-am
Expand Down Expand Up @@ -884,6 +914,8 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-rm -f include/gzstream/$(DEPDIR)/$(am__dirstamp)
-rm -f include/gzstream/$(am__dirstamp)
-rm -f src/$(DEPDIR)/$(am__dirstamp)
-rm -f src/$(am__dirstamp)
-rm -f src/linux/$(DEPDIR)/$(am__dirstamp)
Expand All @@ -899,7 +931,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \

distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf src/$(DEPDIR) src/linux/$(DEPDIR)
-rm -rf include/gzstream/$(DEPDIR) src/$(DEPDIR) src/linux/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
Expand Down Expand Up @@ -947,7 +979,7 @@ installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
-rm -rf src/$(DEPDIR) src/linux/$(DEPDIR)
-rm -rf include/gzstream/$(DEPDIR) src/$(DEPDIR) src/linux/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic

Expand Down
27 changes: 18 additions & 9 deletions aclocal.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,29 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
# Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
# Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
# Copyright (c) 2014 Alexey Sokolov <sokolov@google.com>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.

#serial 3
#serial 4

m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [
m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[
template <typename T>
struct check
{
static_assert(sizeof(int) <= sizeof(T), "not big enough");
};
struct Base {
virtual void f() {}
};
struct Child : public Base {
virtual void f() override {}
};
typedef check<check<bool>> right_angle_brackets;
int a;
Expand All @@ -74,7 +82,8 @@ m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [
check_type&& cr = static_cast<check_type&&>(c);
auto d = a;
])
auto l = [](){};
]])

AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
m4_if([$1], [], [],
Expand All @@ -84,7 +93,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
[$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
[$2], [optional], [ax_cxx_compile_cxx11_required=false],
[m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl
[m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])
AC_LANG_PUSH([C++])dnl
ac_success=no
AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
Expand Down Expand Up @@ -237,10 +246,9 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.

AC_DEFUN([AM_AUX_DIR_EXPAND],
[dnl Rely on autoconf to set up CDPATH properly.
AC_PREREQ([2.50])dnl
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
# Expand $ac_aux_dir to an absolute path.
am_aux_dir=`cd "$ac_aux_dir" && pwd`
])

# AM_CONDITIONAL -*- Autoconf -*-
Expand Down Expand Up @@ -707,7 +715,8 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
fi])
fi
])

dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
Expand Down
Loading

0 comments on commit 9a841f7

Please sign in to comment.