Ignore:
Timestamp:
Sep 13, 2009 2:24:20 PM (11 years ago)
Author:
stefan
Message:

revert my recent changes related to BSPsplit after copying them into branches

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/trunk/Makefile.am

    r1388 r1411  
    1717libampl   = $(AMPLSOLVER_A)
    1818
    19 #if SKIPMAKE
    20 #  alltargets =
    21 #else
     19if SKIPMAKE
     20  alltargets =
     21else
    2222  alltargets = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
    23 #endif
     23endif
    2424
    2525all-local: $(alltargets)
     
    3535stdio1.h arith.h funcadd0.$(OBJEXT): $(libampl)
    3636
    37 thirdpartylibdir = $(prefix)/lib/ThirdParty
    38 install-exec-local: $(libampl)
    39         test -z "$(DESTDIR)$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
    40         $(install_sh_DATA) $(libampl) "$(DESTDIR)$(thirdpartylibdir)/$(libampl)"
    41 
    42 uninstall-local:
    43         rm -f $(DESTDIR)$(thirdpartylibdir)/$(libampl)
    44 
    45 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/ASL
    46 addlibs_DATA = README asl_addlibs.txt
    47 
    48 thirdpartyincludedir = $(includedir)/coin/ThirdParty
    49 thirdpartyinclude_HEADERS = \
    50   solvers/asl.h solvers/asl_pfg.h solvers/asl_pfgh.h solvers/psinfo.h solvers/funcadd.h \
    51   solvers/nlp.h solvers/nlp2.h solvers/getstub.h solvers/opcode.hd solvers/r_opn.hd \
    52   stdio1.h arith.h
    53 
    5437CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
    5538
Note: See TracChangeset for help on using the changeset viewer.