Ignore:
Timestamp:
Aug 12, 2016, 11:24:15 AM (8 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
9903ebb
Parents:
71b5d4d3 (diff), 1ca15c1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/Makefile.in

    r71b5d4d3 rdac593fd  
    8989libcfa_a_AR = $(AR) $(ARFLAGS)
    9090libcfa_a_LIBADD =
    91 am__dirstamp = $(am__leading_dot)dirstamp
    9291am__objects_1 = limits.$(OBJEXT) stdlib.$(OBJEXT) math.$(OBJEXT) \
    9392        iostream.$(OBJEXT) fstream.$(OBJEXT) iterator.$(OBJEXT) \
    94         rational.$(OBJEXT) containers/vector.$(OBJEXT)
     93        rational.$(OBJEXT)
    9594am_libcfa_a_OBJECTS = libcfa-prelude.$(OBJEXT) $(am__objects_1)
    9695libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
     
    234233cfalib_DATA = builtins.cf extras.cf prelude.cf
    235234MAINTAINERCLEANFILES = builtins.cf extras.cf ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
    236 headers = limits stdlib math iostream fstream iterator rational containers/vector
     235headers = limits stdlib math iostream fstream iterator rational # containers/vector
    237236libobjs = ${headers:=.o}
    238237libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
     
    304303clean-libLIBRARIES:
    305304        -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
    306 containers/$(am__dirstamp):
    307         @$(MKDIR_P) containers
    308         @: > containers/$(am__dirstamp)
    309 containers/$(DEPDIR)/$(am__dirstamp):
    310         @$(MKDIR_P) containers/$(DEPDIR)
    311         @: > containers/$(DEPDIR)/$(am__dirstamp)
    312 containers/vector.$(OBJEXT): containers/$(am__dirstamp) \
    313         containers/$(DEPDIR)/$(am__dirstamp)
    314305libcfa.a: $(libcfa_a_OBJECTS) $(libcfa_a_DEPENDENCIES) $(EXTRA_libcfa_a_DEPENDENCIES)
    315306        $(AM_V_at)-rm -f libcfa.a
     
    319310mostlyclean-compile:
    320311        -rm -f *.$(OBJEXT)
    321         -rm -f containers/vector.$(OBJEXT)
    322312
    323313distclean-compile:
     
    332322@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rational.Po@am__quote@
    333323@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdlib.Po@am__quote@
    334 @AMDEP_TRUE@@am__include@ @am__quote@containers/$(DEPDIR)/vector.Po@am__quote@
    335324
    336325.c.o:
     
    505494        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
    506495        -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
    507         -rm -f containers/$(DEPDIR)/$(am__dirstamp)
    508         -rm -f containers/$(am__dirstamp)
    509496
    510497maintainer-clean-generic:
     
    517504
    518505distclean: distclean-am
    519         -rm -rf ./$(DEPDIR) containers/$(DEPDIR)
     506        -rm -rf ./$(DEPDIR)
    520507        -rm -f Makefile
    521508distclean-am: clean-am distclean-compile distclean-generic \
     
    563550
    564551maintainer-clean: maintainer-clean-am
    565         -rm -rf ./$(DEPDIR) containers/$(DEPDIR)
     552        -rm -rf ./$(DEPDIR)
    566553        -rm -f Makefile
    567554maintainer-clean-am: distclean-am maintainer-clean-generic \
Note: See TracChangeset for help on using the changeset viewer.