Changeset 1860 for trunk/gsdl/lib/Makefile.in

Timestamp:

2001-01-26T07:26:45+13:00 (23 years ago)

Author:

cs025

Message:

Included CORBA branch for first time

File:

• trunk/gsdl/lib/Makefile.in (modified) (4 diffs)

trunk/gsdl/lib/Makefile.in

@@ -28 +28 @@
 AR = ar
 CC = @CC@
+CPP = @CXX@
 #CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual
 CCFLAGS = @CFLAGS@
+MCFLAGS = @CFLAGS@ -Wall -Wunused
 DEFS = @DEFS@
-INCLUDES = -I../packages/mg/lib
+INCLUDES = -I../packages/mg/lib -I..
+MICO_DIR = @MICO_DIR@
+ifeq ($(MICO_DIR), default)
+MICO_INC = -I../packages/mico/include
+else
+ifeq ($(MICO_DIR), yes)
+MICO_INC =
+else
+MICO_INC = -I$(MICO_DIR)
+endif
+endif
+MINCLUDES = -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-c++ -x c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
+else
+MCOMPILE = $(COMPILE)
+endif
 
 .SUFFIXES:
@@ -43 +64 @@
 .SUFFIXES: .cpp .o
 .cpp.o:
-    $(COMPILE) $< 
+    $(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
+CORBAOBJECTS = \
+  corbaiface.o      corbatext_t.o    corbaconv_text_t.o
+else
+CORBAHEADERS = 
+CORBASOURCE = 
+CORBAOBJECTS = 
+endif
+
 HEADERS = \
-  cfgread.h      fileutil.h     gsdlunicode.h  text_t.h \
-  display.h      gsdlconf.h     gsdltimes.h    gsdltools.h
+  cfgread.h      fileutil.h     gsdlunicode.h  gsdltools.h text_t.h \
+  display.h      gsdlconf.h     gsdltimes.h    cnfgable.h  cnfgator.h \
+  $(CORBAHEADERS)
+
 
 SOURCES = \
-  cfgread.cpp      fileutil.cpp     text_t.cpp \
-  display.cpp      gsdlunicode.cpp  gsdltimes.cpp  gsdltools.cpp
+  cfgread.cpp      fileutil.cpp     text_t.cpp     cnfgable.cpp \
+  display.cpp      gsdlunicode.cpp  gsdltimes.cpp  gsdltools.cpp \
+  cnfgator.cpp     $(CORBASOURCES)
 
 OBJECTS = \
-  cfgread.o        fileutil.o       text_t.o   \
-  display.o        gsdlunicode.o    gsdltimes.o  gsdltools.o
+  cfgread.o        fileutil.o       text_t.o     cnfgable.o \
+  display.o        gsdlunicode.o    gsdltimes.o  gsdltools.o \
+  cnfgator.o       $(CORBAOBJECTS)
 
 
 all: gsdllib.a
 
+corbaiface.mpp: corbaiface.idl
+    idl --c++-suffix=mpp $?
 
 GSDLLIBOBJECTS = $(OBJECTS)
@@ -69 +113 @@
     $(RANLIB) gsdllib.a
 
-distclean:
-    rm -f $(OBJECTS) gsdllib.a Makefile
-
 clean:
     rm -f $(OBJECTS) gsdllib.a
@@ -79 +120 @@
 depend:
     makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES)
+
+
+
+