/[escript]/trunk/esys2/make/Makefile.source
ViewVC logotype

Diff of /trunk/esys2/make/Makefile.source

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 122 by jgs, Thu Jun 9 05:38:05 2005 UTC revision 147 by jgs, Fri Aug 12 01:45:47 2005 UTC
# Line 24  SWIG_SHOBJ := ${patsubst %.i, %.lo, ${SW Line 24  SWIG_SHOBJ := ${patsubst %.i, %.lo, ${SW
24    
25  # Python Source  # Python Source
26  # Find all .py files in source directory, and define matching .pyc files  # Find all .py files in source directory, and define matching .pyc files
27  PYTHON_SRC := ${patsubst ${L_SRC_DIR}/%, %, ${shell find ${L_SRC_DIR} -name \*.py | grep -v '-'}}  PYTHON_SRC_SRC := ${shell find ${L_SRC_DIR} -name \*.py | grep -v '-'}
28  PYTHON_BYTE := ${patsubst %.py, %.pyc, ${PYTHON_SRC}}  PYTHON_SRC := ${patsubst ${L_SRC_DIR}/%, %, ${PYTHON_SRC_SRC}}
29    PYTHON_BYTE := ${patsubst %.py, %.pyc, ${PYTHON_SRC_SRC}}
30    
31  # Search Paths  # Search Paths
32  # define locations to search for each file type  # define locations to search for each file type
# Line 40  vpath %.so  ${L_LIB_DIR} Line 41  vpath %.so  ${L_LIB_DIR}
41  vpath %.pyc ${L_LIB_DIR}  vpath %.pyc ${L_LIB_DIR}
42    
43  # $Log$  # $Log$
44    # Revision 1.3  2005/08/12 01:45:45  jgs
45    # erge of development branch dev-02 back to main trunk on 2005-08-12
46    #
47    # Revision 1.2.2.1  2005/08/01 10:23:56  gross
48    # Bug in installation of python only components such as modellib fixed:
49    #
50    # C/C++ in ./src is directly compiled into ./lib but python code in ./py_src into ./lib/py_src.
51    # therefore for C/C++ code the leading directory ./src in names is removed for the output. The same is
52    # tried for python code however the substitution is not done correctly when leads to the effect that components that
53    # are compiled from one directory only the leading subdirectory is removed but for components build from more than one
54    # directory only the first subdirectory (typically ./src) is removed but subsequent directories are not removed.
55    # Therefore escript is run but not modellib (at least the compiled code apeared in ./lib rather than ./lib/py_src).
56    # The fix works around this problem for python compilations.
57    #
58  # Revision 1.2  2005/06/09 05:38:03  jgs  # Revision 1.2  2005/06/09 05:38:03  jgs
59  # Merge of development branch back to main trunk on 2005-06-09  # Merge of development branch back to main trunk on 2005-06-09
60  #  #

Legend:
Removed from v.122  
changed lines
  Added in v.147

  ViewVC Help
Powered by ViewVC 1.1.26