Ignore:
Timestamp:
Aug 7, 2011 11:02:46 AM (8 years ago)
Author:
stefan
Message:

fixup buildsystem

  • fix compiler warnings
  • get C code compiling with C compiler (no C++ style comments allowed!)
  • remove unnecessary package checks, CoinMP seems to depend on Clp, OsiClp?, and Cbc only
  • fix link to mailing list
  • fix copyright statement
  • remove unnecessary config_default.h, CoinMP does not use config header files
  • remove old addlibs file
  • create useable Makefile for example
  • fix directory where example source is installed
  • fix addlibs file for cl compiler
  • fix include of Makemain.inc
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CoinMP/Makefile.am

    r427 r428  
    6060addlibsdir = $(DESTDIR)$(datadir)/coin/doc/CoinMP
    6161
    62 examplefiles = $(srcdir)/examples/Makefile $(srcdir)/examples/example.c
    63 examplesdir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)/examples
    64 
    65 install-exec-local: install-doc
    66         mkdir -p $(DESTDIR)$(examplesdir)
    67         $(install_sh_DATA) $(examplefiles) $(DESTDIR)$(examplesdir)
     62addlibs_DATA = examples/Makefile examples/example.c
    6863
    6964install-data-hook:
     
    7469else
    7570if COIN_CXX_IS_CL
    76         echo "/libpath:`$(CYGPATH_W) @abs_lib_dir@` libCoinMP.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/coin_addlibs_cpp.txt
     71        echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCoinMP.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/coin_addlibs_cpp.txt
    7772else
    7873        echo -L@abs_lib_dir@ -lCoinMP @COINMP_LIBS_INSTALLED@ > $(addlibsdir)/coinmp_addlibs.txt
     
    8075endif
    8176
    82 uninstall-local: uninstall-doc
    83         rm -f $(DESTDIR)$(addlibsdir)/$(addlibsfile)
    84         rm -rf $(DESTDIR)$(examplesdir)
    85 
    8677uninstall-hook:
    8778        rm -f $(addlibsdir)/coinmp_addlibs.txt
     79
     80install-exec-local: install-doc
     81
     82uninstall-local: uninstall-doc
    8883
    8984########################################################################
     
    9489DISTCLEANFILES =
    9590
    96 include ../BuildTools/Makemain.inc
     91include BuildTools/Makemain.inc
Note: See TracChangeset for help on using the changeset viewer.