Changeset 9758


Ignore:
Timestamp:
2005-04-27T15:12:47+12:00 (19 years ago)
Author:
kjdon
Message:

got rid of the corba and mico stuff

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gs2build-extra/lib.Makefile.in

    r9749 r9758  
    3131#CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual
    3232CCFLAGS = @CFLAGS@
    33 MCFLAGS = -Wall -Wunused
    3433DEFS = @DEFS@
    3534INCLUDES = -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..
    4935RANLIB = @RANLIB@
    50 USE_CORBA = @USE_CORBA@
    5136
    5237COMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
    5338CPPCOMPILE = $(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
    6039
    6140.SUFFIXES:
    … …  
    6847    $(CPPCOMPILE) $<
    6948
    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 
    9049HEADERS = \
    91   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 
     50 text_t.h gsdlconf.h
    9551
    9652SOURCES = \
    97   cfgread.cpp      fileutil.cpp     text_t.cpp     cnfgable.cpp \
    98   display.cpp      gsdlunicode.cpp  gsdltimes.cpp  gsdltools.cpp \
    99   cnfgator.cpp     $(CORBASOURCES)
     53  text_t.cpp
    10054
    10155OBJECTS = \
    102   cfgread.o        fileutil.o       text_t.o     cnfgable.o \
    103   display.o        gsdlunicode.o    gsdltimes.o  gsdltools.o \
    104   cnfgator.o       $(CORBAOBJECTS)
     56  text_t.o 
    10557
    10658
    10759all: 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 $?
    11460
    115 #GSDLLIBOBJECTS = $(OBJECTS)
    116 GSDLLIBOBJECTS = text_t.o
     61GSDLLIBOBJECTS = $(OBJECTS)
     62
    11763gsdllib.a: $(GSDLLIBOBJECTS)
    11864    rm -f gsdllib.a
    … …  
    12167
    12268clean:
    123     rm -f $(OBJECTS) gsdllib.a corbaiface_skel.mpp corbaiface.h corbaiface.mpp
     69    rm -f $(OBJECTS) gsdllib.a
    12470
    12571distclean: clean
Note: See TracChangeset for help on using the changeset viewer.