Changeset 9758 for trunk/gs2build-extra/lib.Makefile.in

Timestamp:

2005-04-27T15:12:47+12:00 (18 years ago)

Author:

kjdon

Message:

got rid of the corba and mico stuff

File:

• trunk/gs2build-extra/lib.Makefile.in (modified) (3 diffs)

trunk/gs2build-extra/lib.Makefile.in

@@ -31 +31 @@
 #CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual
 CCFLAGS = @CFLAGS@
-MCFLAGS = -Wall -Wunused
 DEFS = @DEFS@
 INCLUDES = -I../packages/mg/lib -I..
-MICO_DIR = @MICO_DIR@
-ifeq ($(MICO_DIR), default)
-MICO_INC = -I../packages/mico/mico/include
-MICO_PATH = ../bin/linux/
-else
-ifeq ($(MICO_DIR), yes)
-MICO_INC =
-else
-MICO_INC = -I$(MICO_DIR)
-endif
-MICO_PATH =
-endif
-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..
 RANLIB = @RANLIB@
-USE_CORBA = @USE_CORBA@
 
 COMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
 CPPCOMPILE = $(CPP) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
-
-ifneq ($(USE_CORBA), 0)
-MCOMPILE = $(MICO_PATH)mico-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
-else
-MCOMPILE = $(COMPILE)
-endif
 
 .SUFFIXES:
@@ -68 +47 @@
     $(CPPCOMPILE) $< 
 
-.SUFFIXES: .mpp .o
-.mpp.o:
-    $(MCOMPILE) $<
-
-
-
-
-ifneq ($(USE_CORBA), 0)
-CORBAHEADERS = \
-  corbaconv_text_t.h corbatext_t.h
-CORBASOURCES = \
-  corbaiface.mpp    corbatext_t.mpp  corbaconv_text_t.mpp corbaiface_skel.mpp
-CORBAOBJECTS = \
-  corbaiface.o      corbatext_t.o    corbaconv_text_t.o   corbaiface_skel.o 
-else
-CORBAHEADERS = 
-CORBASOURCE = 
-CORBAOBJECTS = 
-endif
-
 HEADERS = \
-  cfgread.h      fileutil.h     gsdlunicode.h  gsdltools.h text_t.h \
-  display.h      gsdlconf.h     gsdltimes.h    cnfgable.h  cnfgator.h \
-  $(CORBAHEADERS)
-
+ text_t.h gsdlconf.h 
 
 SOURCES = \
-  cfgread.cpp      fileutil.cpp     text_t.cpp     cnfgable.cpp \
-  display.cpp      gsdlunicode.cpp  gsdltimes.cpp  gsdltools.cpp \
-  cnfgator.cpp     $(CORBASOURCES)
+  text_t.cpp 
 
 OBJECTS = \
-  cfgread.o        fileutil.o       text_t.o     cnfgable.o \
-  display.o        gsdlunicode.o    gsdltimes.o  gsdltools.o \
-  cnfgator.o       $(CORBAOBJECTS)
+  text_t.o  
 
 
 all: gsdllib.a
-corbaiface_skel.h: corbaiface.idl
-    LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=$(MICO_PATH):$(PATH) idl --boa --no-poa --c++-skel --c++-suffix=mpp $?
-corbaiface_skel.mpp: corbaiface.idl
-    LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=$(MICO_PATH):$(PATH) idl --boa --no-poa --c++-skel --c++-suffix=mpp $?
-corbaiface.mpp: corbaiface.idl
-    LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=$(MICO_PATH):$(PATH) idl --boa --no-poa --c++-skel --c++-suffix=mpp $?
 
-#GSDLLIBOBJECTS = $(OBJECTS)
-GSDLLIBOBJECTS = text_t.o
+GSDLLIBOBJECTS = $(OBJECTS)
+
 gsdllib.a: $(GSDLLIBOBJECTS)
     rm -f gsdllib.a
@@ -121 +67 @@
 
 clean:
-    rm -f $(OBJECTS) gsdllib.a corbaiface_skel.mpp corbaiface.h corbaiface.mpp
+    rm -f $(OBJECTS) gsdllib.a 
 
 distclean: clean