IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 26247


Ignore:
Timestamp:
Nov 22, 2009, 1:31:30 PM (17 years ago)
Author:
eugene
Message:

fixing build to work with -j4

Location:
branches/eam_branches/20091113/magic
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/20091113/magic/Makefile.in

    r25082 r26247  
    3232REMOVE = remove/src
    3333
    34 REMOVE_PROGRAMS = \
    35 $(REMOVE)/isdestreaked \
    36 $(REMOVE)/streakscompare \
    37 $(REMOVE)/streaksrelease \
    38 $(REMOVE)/streaksremove \
    39 $(REMOVE)/streaksreplace
    40 
    41 remove: $(REMOVE_PROGRAMS)
    42 
    43  $(REMOVE_PROGRAMS):
     34remove: FORCE
    4435        @cd $(REMOVE) && make -f Makefile.simple all
    4536
    4637remove.install: remove
    4738        @cd $(REMOVE) && make -f Makefile.simple install
     39
     40FORCE:

  • branches/eam_branches/20091113/magic/configure.tcsh

    r25431 r26247  
    105105echo
    106106
    107 # the config.tools fixconf operations below interpolate values in Makefile
    108 if (-e Makefile) mv Makefile Makefile.bak
    109 cp -f Makefile.in Makefile
     107# we do not actually need to modify the Makefile
    110108
     109#  # the config.tools fixconf operations below interpolate values in Makefile
     110#  if (-e Makefile) mv Makefile Makefile.bak
     111#  cp -f Makefile.in Makefile
     112# 
    111113# BINDIR holds the output binary files
    112114if ("$bindir" == "") then
    … …  
    115117endif
    116118set bindir = `./config.tools fixpath $bindir`
    117 ./config.tools fixconf @BINDIR@ $bindir
    118 echo BINDIR $bindir
    119119
    120 # MANDIR (DESTMAN) holds the output man pages
    121 if ("$mandir" == "") then
    122   set mandir = $prefix/man
    123 endif
    124 set mandir = `./config.tools fixpath $mandir`
    125 ./config.tools fixconf @MANDIR@ $mandir
    126 echo DESTMAN $mandir
     120#  ./config.tools fixconf @BINDIR@ $bindir
     121#  echo BINDIR $bindir
     122# 
     123#  # MANDIR (DESTMAN) holds the output man pages
     124#  if ("$mandir" == "") then
     125#    set mandir = $prefix/man
     126#  endif
     127#  set mandir = `./config.tools fixpath $mandir`
     128#  ./config.tools fixconf @MANDIR@ $mandir
     129#  echo DESTMAN $mandir
    127130
    128131echo ""

  • branches/eam_branches/20091113/magic/remove/src/Makefile.simple

    r25082 r26247  
    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.