Changeset 5545


Ignore:
Timestamp:
2003-09-30T22:47:27+12:00 (21 years ago)
Author:
sjboddie
Message:

* empty log message *

Location:
trunk/greenorg
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/greenorg/Makefile.in

    r5503 r5545  
    4848ALLFILES = $(OBJECTS)
    4949
    50 INSTALLDIRS = src/recpt src/txt2db src/db2txt src/hashfile src/getpw packages/mg src/phind/generate packages src/mgpp
     50INSTALLDIRS = src/recpt
    5151
    5252MODULEDIRS = @MODULEDIRS@
    5353
    54 OTHERDIRS = packages packages/mg lib src/mgpp src/colservr src/recpt src/txt2db src/db2txt src/hashfile src/getpw src/phind/generate
     54OTHERDIRS = lib src/recpt
    5555
    5656all:

  • trunk/greenorg/configure

    r5503 r5545  
    52485248
    52495249# the list of folders in the src folder
    5250 srclist="src/mgpp/lib/Makefile src/mgpp/text/Makefile src/mgpp/Makefile \
    5251           src/hashfile/Makefile src/colservr/Makefile src/recpt/Makefile src/txt2db/Makefile \
    5252           src/db2txt/Makefile src/getpw/Makefile src/phind/generate/Makefile"
    5253 
    5254 ac_config_files="$ac_config_files packages/Makefile packages/mg/Makefile packages/mg/src/text/Makefile packages/mg/src/images/Makefile packages/mg/src/scripts/Makefile packages/mg/lib/Makefile lib/Makefile Makefile $srclist $moduleDirs"
     5250srclist="src/recpt/Makefile"
     5251
     5252ac_config_files="$ac_config_files lib/Makefile Makefile $srclist"
    52555253cat >confcache <<\_ACEOF
    52565254# This file is a shell script that caches the results of configure
    … …  
    53325330ac_clean_files_save=$ac_clean_files
    53335331ac_clean_files="$ac_clean_files $CONFIG_STATUS"
    5334 { echo "$as_me:5334: creating $CONFIG_STATUS" >&5
     5332{ echo "$as_me:5332: creating $CONFIG_STATUS" >&5
    53355333echo "$as_me: creating $CONFIG_STATUS" >&6;}
    53365334cat >$CONFIG_STATUS <<_ACEOF
    … …  
    55055503  --he | --h)
    55065504    # Conflict between --help and --header
    5507     { { echo "$as_me:5507: error: ambiguous option: $1
     5505    { { echo "$as_me:5505: error: ambiguous option: $1
    55085506Try \`$0 --help' for more information." >&5
    55095507echo "$as_me: error: ambiguous option: $1
    … …  
    55245522
    55255523  # Handling of arguments.
    5526   'packages/Makefile' ) CONFIG_FILES="$CONFIG_FILES packages/Makefile" ;;
    5527   'packages/mg/Makefile' ) CONFIG_FILES="$CONFIG_FILES packages/mg/Makefile" ;;
    5528   'packages/mg/src/text/Makefile' ) CONFIG_FILES="$CONFIG_FILES packages/mg/src/text/Makefile" ;;
    5529   'packages/mg/src/images/Makefile' ) CONFIG_FILES="$CONFIG_FILES packages/mg/src/images/Makefile" ;;
    5530   'packages/mg/src/scripts/Makefile' ) CONFIG_FILES="$CONFIG_FILES packages/mg/src/scripts/Makefile" ;;
    5531   'packages/mg/lib/Makefile' ) CONFIG_FILES="$CONFIG_FILES packages/mg/lib/Makefile" ;;
    55325524  'lib/Makefile' ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
    55335525  'Makefile' ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    55345526  '$srclist' ) CONFIG_FILES="$CONFIG_FILES $srclist" ;;
    5535   '$moduleDirs' ) CONFIG_FILES="$CONFIG_FILES $moduleDirs" ;;
    55365527  'config.h' ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
    55375528
    55385529  # This is an error.
    5539   -*) { { echo "$as_me:5539: error: unrecognized option: $1
     5530  -*) { { echo "$as_me:5530: error: unrecognized option: $1
    55405531Try \`$0 --help' for more information." >&5
    55415532echo "$as_me: error: unrecognized option: $1
    55425533Try \`$0 --help' for more information." >&2;}
    55435534   { (exit 1); exit 1; }; } ;;
    5544   *) { { echo "$as_me:5544: error: invalid argument: $1" >&5
     5535  *) { { echo "$as_me:5535: error: invalid argument: $1" >&5
    55455536echo "$as_me: error: invalid argument: $1" >&2;}
    55465537   { (exit 1); exit 1; }; };;
    … …  
    57995790
    58005791  if test x"$ac_file" != x-; then
    5801     { echo "$as_me:5801: creating $ac_file" >&5
     5792    { echo "$as_me:5792: creating $ac_file" >&5
    58025793echo "$as_me: creating $ac_file" >&6;}
    58035794    rm -f "$ac_file"
    … …  
    58175808      [\\/$]*)
    58185809         # Absolute (can't be DOS-style, as IFS=:)
    5819          test -f "$f" || { { echo "$as_me:5819: error: cannot find input file: $f" >&5
     5810         test -f "$f" || { { echo "$as_me:5810: error: cannot find input file: $f" >&5
    58205811echo "$as_me: error: cannot find input file: $f" >&2;}
    58215812   { (exit 1); exit 1; }; }
    … …  
    58305821         else
    58315822           # /dev/null tree
    5832            { { echo "$as_me:5832: error: cannot find input file: $f" >&5
     5823           { { echo "$as_me:5823: error: cannot find input file: $f" >&5
    58335824echo "$as_me: error: cannot find input file: $f" >&2;}
    58345825   { (exit 1); exit 1; }; }
    … …  
    58915882  esac
    58925883
    5893   test x"$ac_file" != x- && { echo "$as_me:5893: creating $ac_file" >&5
     5884  test x"$ac_file" != x- && { echo "$as_me:5884: creating $ac_file" >&5
    58945885echo "$as_me: creating $ac_file" >&6;}
    58955886
    … …  
    59025893      [\\/$]*)
    59035894         # Absolute (can't be DOS-style, as IFS=:)
    5904          test -f "$f" || { { echo "$as_me:5904: error: cannot find input file: $f" >&5
     5895         test -f "$f" || { { echo "$as_me:5895: error: cannot find input file: $f" >&5
    59055896echo "$as_me: error: cannot find input file: $f" >&2;}
    59065897   { (exit 1); exit 1; }; }
    … …  
    59155906         else
    59165907           # /dev/null tree
    5917            { { echo "$as_me:5917: error: cannot find input file: $f" >&5
     5908           { { echo "$as_me:5908: error: cannot find input file: $f" >&5
    59185909echo "$as_me: error: cannot find input file: $f" >&2;}
    59195910   { (exit 1); exit 1; }; }
    … …  
    60326023  if test x"$ac_file" != x-; then
    60336024    if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
    6034       { echo "$as_me:6034: $ac_file is unchanged" >&5
     6025      { echo "$as_me:6025: $ac_file is unchanged" >&5
    60356026echo "$as_me: $ac_file is unchanged" >&6;}
    60366027    else
    … …  
    61366127    test -d $srcdir/$ac_subdir || continue
    61376128
    6138     { echo "$as_me:6138: configuring in $ac_subdir" >&5
     6129    { echo "$as_me:6129: configuring in $ac_subdir" >&5
    61396130echo "$as_me: configuring in $ac_subdir" >&6;}
    61406131    case $srcdir in
    … …  
    61586149       if test -d ./$ac_subdir; then :;
    61596150       else
    6160          { { echo "$as_me:6160: error: cannot create \`pwd\`/$ac_subdir" >&5
     6151         { { echo "$as_me:6151: error: cannot create \`pwd\`/$ac_subdir" >&5
    61616152echo "$as_me: error: cannot create \`pwd\`/$ac_subdir" >&2;}
    61626153   { (exit 1); exit 1; }; }
    … …  
    61896180      ac_sub_configure=$ac_configure
    61906181    else
    6191       { echo "$as_me:6191: WARNING: no configuration information is in $ac_subdir" >&5
     6182      { echo "$as_me:6182: WARNING: no configuration information is in $ac_subdir" >&5
    61926183echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2;}
    61936184      ac_sub_configure=
    … …  
    62036194      esac
    62046195
    6205       { echo "$as_me:6205: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&5
     6196      { echo "$as_me:6196: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&5
    62066197echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&6;}
    62076198      # The eval makes quoting arguments work.
    62086199      eval $ac_sub_configure $ac_sub_configure_args \
    62096200           --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir ||
    6210         { { echo "$as_me:6210: error: $ac_sub_configure failed for $ac_subdir" >&5
     6201        { { echo "$as_me:6201: error: $ac_sub_configure failed for $ac_subdir" >&5
    62116202echo "$as_me: error: $ac_sub_configure failed for $ac_subdir" >&2;}
    62126203   { (exit 1); exit 1; }; }

  • trunk/greenorg/configure.in

    r5503 r5545  
    388388
    389389# the list of folders in the src folder
    390 srclist="src/mgpp/lib/Makefile src/mgpp/text/Makefile src/mgpp/Makefile \
    391           src/hashfile/Makefile src/colservr/Makefile src/recpt/Makefile src/txt2db/Makefile \
    392           src/db2txt/Makefile src/getpw/Makefile src/phind/generate/Makefile"
    393 
    394 AC_OUTPUT(packages/Makefile packages/mg/Makefile packages/mg/src/text/Makefile packages/mg/src/images/Makefile
    395           packages/mg/src/scripts/Makefile packages/mg/lib/Makefile
    396       lib/Makefile Makefile $srclist $moduleDirs)
    397 
    398 
     390srclist="src/recpt/Makefile"
     391
     392AC_OUTPUT(lib/Makefile Makefile $srclist)
     393
     394

  • trunk/greenorg/lib/Makefile.in

    r5503 r5545  
    3333MCFLAGS = -Wall -Wunused
    3434DEFS = @DEFS@
    35 INCLUDES = -I../packages/mg/lib -I..
    36 MICO_DIR = @MICO_DIR@
    37 ifeq ($(MICO_DIR), default)
    38 MICO_INC = -I../packages/mico/mico/include
    39 MICO_PATH = ../bin/linux/
    40 else
    41 ifeq ($(MICO_DIR), yes)
    42 MICO_INC =
    43 else
    44 MICO_INC = -I$(MICO_DIR)
    45 endif
    46 MICO_PATH =
    47 endif
    48 MINCLUDES = -I/usr/include/g++-2/ -I/usr/lib/gcc-lib/i386-slackware-linux/egcs-2.91.66/include/ -I/usr/include -I.  -I../packages/mg/lib $(MICO_INC) -I..
     35INCLUDES = -I..
    4936RANLIB = @RANLIB@
    50 USE_CORBA = @USE_CORBA@
    5137
    5238COMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
    5339CPPCOMPILE = $(CPP) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
    54 
    55 ifneq ($(USE_CORBA), 0)
    56 MCOMPILE = $(MICO_PATH)mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
    57 else
    58 MCOMPILE = $(COMPILE)
    59 endif
    6040
    6141.SUFFIXES:
    … …  
    6848    $(CPPCOMPILE) $<
    6949
    70 .SUFFIXES: .mpp .o
    71 .mpp.o:
    72     $(MCOMPILE) $<
    73 
    74 
    75 
    76 
    77 ifneq ($(USE_CORBA), 0)
    78 CORBAHEADERS = \
    79   corbaconv_text_t.h corbatext_t.h
    80 CORBASOURCES = \
    81   corbaiface.mpp    corbatext_t.mpp  corbaconv_text_t.mpp corbaiface_skel.mpp
    82 CORBAOBJECTS = \
    83   corbaiface.o      corbatext_t.o    corbaconv_text_t.o   corbaiface_skel.o
    84 else
    85 CORBAHEADERS =
    86 CORBASOURCE =
    87 CORBAOBJECTS =
    88 endif
    89 
    9050HEADERS = \
    9151  cfgread.h      fileutil.h     gsdlunicode.h  gsdltools.h text_t.h \
    92   display.h      gsdlconf.h     gsdltimes.h    cnfgable.h  cnfgator.h \
    93   $(CORBAHEADERS)
    94 
     52  display.h      gsdlconf.h     cnfgable.h     gsdltimes.h cnfgator.h  unitool.h
    9553
    9654SOURCES = \
    9755  cfgread.cpp      fileutil.cpp     text_t.cpp     cnfgable.cpp \
    9856  display.cpp      gsdlunicode.cpp  gsdltimes.cpp  gsdltools.cpp \
    99   cnfgator.cpp     $(CORBASOURCES)
     57  cnfgator.cpp     unitool.c
    10058
    10159OBJECTS = \
    10260  cfgread.o        fileutil.o       text_t.o     cnfgable.o \
    10361  display.o        gsdlunicode.o    gsdltimes.o  gsdltools.o \
    104   cnfgator.o       $(CORBAOBJECTS)
     62  cnfgator.o       unitool.o
    10563
    10664
    10765all: gsdllib.a
    108 corbaiface_skel.h: corbaiface.idl
    109     LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=$(MICO_PATH):$(PATH) idl --boa --no-poa --c++-skel --c++-suffix=mpp $?
    110 corbaiface_skel.mpp: corbaiface.idl
    111     LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=$(MICO_PATH):$(PATH) idl --boa --no-poa --c++-skel --c++-suffix=mpp $?
    112 corbaiface.mpp: corbaiface.idl
    113     LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=$(MICO_PATH):$(PATH) idl --boa --no-poa --c++-skel --c++-suffix=mpp $?
    11466
    11567GSDLLIBOBJECTS = $(OBJECTS)
    … …  
    12173
    12274clean:
    123     rm -f $(OBJECTS) gsdllib.a corbaiface_skel.mpp corbaiface.h corbaiface.mpp
     75    rm -f $(OBJECTS) gsdllib.a
    12476
    12577distclean: clean
Note: See TracChangeset for help on using the changeset viewer.