IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 26256 for trunk/magic


Ignore:
Timestamp:
Nov 22, 2009, 2:52:46 PM (16 years ago)
Author:
eugene
Message:

Fixed a number of build issues:

1) magic and gpcsw had problems with collisions in multithreaded build (-j4)
2) some missing perl dependencies (at least on my ubuntu box)
3) XML-NamespaceSupport-1.10.tar.gz requires an additional flag of the build line to avoid

having it run a CPAN query. I added a feature to supply such build line options, requiring
an update of the perl table

Location:
trunk/magic
Files:
5 deleted
2 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/magic

    • Property svn:ignore

      •  

        old new  
        11magic
        22ssa-core-cpp
        3 Makefile
        43Makefile.bak

  • trunk/magic/remove/src/Makefile.simple

    r25082 r26256  
    1010
    1111REMOVE_OBJECTS=    \
    12     ${COMMON_OBJECTS} \
    1312    streaksremove.o \
    1413    streaksextern.o \
    … …  
    1716
    1817REPLACE_OBJECTS=      \
    19     ${COMMON_OBJECTS} \
    2018    streaksreplace.o
    2119
    2220COMPARE_OBJECTS=      \
    23     ${COMMON_OBJECTS} \
    2421    streakscompare.o
    2522
    2623RELEASE_OBJECTS=      \
    27     ${COMMON_OBJECTS} \
    2824    streaksrelease.o
    2925
    3026ISDESTREAKED_OBJECTS=      \
    31     ${COMMON_OBJECTS} \
    3227    isdestreaked.o
    3328
    … …  
    4540HEADERS=Line.h streaksastrom.h streaksextern.h streaksio.h streaksremove.h
    4641
    47 all:    ${PROGRAMS}
     42all: ${PROGRAMS}
    4843
    49 ${REMOVE_OBJECTS}:      ${HEADERS}
    50 streaksremove:  ${REMOVE_OBJECTS}
     44# programs all depend on the common objects and the common headers
     45PROGRAM_OBJECTS = \
     46 ${REMOVE_OBJECTS} \
     47 ${REPLACE_OBJECTS} \
     48 ${COMPARE_OBJECTS} \
     49 ${RELEASE_OBJECTS} \
     50 ${ISDESTREAKED_OBJECTS}
    5151
    52 streaksreplace:  ${REPLACE_OBJECTS}
     52${COMMON_OBJECTS}: ${HEADERS}
    5353
    54 streakscompare:  ${COMPARE_OBJECTS}
     54${PROGRAM_OBJECTS}: ${HEADERS} ${COMMON_OBJECTS}
    5555
    56 streaksrelease:  ${RELEASE_OBJECTS}
     56streaksremove:  ${REMOVE_OBJECTS} ${COMMON_OBJECTS}
    5757
    58 isdestreaked:   ${ISDESTREAKED_OBJECTS}
     58streaksreplace:  ${REPLACE_OBJECTS} ${COMMON_OBJECTS}
     59
     60streakscompare:  ${COMPARE_OBJECTS} ${COMMON_OBJECTS}
     61
     62streaksrelease:  ${RELEASE_OBJECTS} ${COMMON_OBJECTS}
     63
     64isdestreaked:   ${ISDESTREAKED_OBJECTS} ${COMMON_OBJECTS}
    5965
    6066
Note: See TracChangeset for help on using the changeset viewer.