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

Timestamp:

2008-05-15T11:35:26+12:00 (16 years ago)

Author:

mdewsnip

Message:

Moved all the CORBA stuff into the src/corba directory, to prevent it from uglying up the core code.

File:

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

gsdl/trunk/lib/Makefile.in

@@ -29 +29 @@
 CC = @CC@
 CPP = @CXX@
-#CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual
 CCFLAGS = @CFLAGS@
-MCFLAGS = -Wall -Wunused
 DEFS = @DEFS@
 INCLUDES = -I../indexers/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../indexers/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 +46 @@
     $(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 = \
@@ -93 +52 @@
   gsdltimes.h      gsdltools.h      gsdlunicode.h    infodbclass.h \
   md5.h            OIDtools.h       phrases.h        text_t.h \
-  $(CORBAHEADERS)  gsdlconf.h
+  gsdlconf.h
 
 SOURCES = \
@@ -99 +58 @@
   display.cpp      fileutil.cpp     gdbmclass.cpp    gsdlsitecfg.cpp \
   gsdltimes.cpp    gsdltools.cpp    gsdlunicode.cpp  infodbclass.cpp \
-  md5.cpp          OIDtools.cpp     phrases.cpp      text_t.cpp \
-  $(CORBASOURCES)
+  md5.cpp          OIDtools.cpp     phrases.cpp      text_t.cpp
 
 OBJECTS = \
@@ -106 +64 @@
   display.o        fileutil.o       gdbmclass.o      gsdlsitecfg.o \
   gsdltimes.o      gsdltools.o      gsdlunicode.o    infodbclass.o \
-  md5.o            OIDtools.o       phrases.o        text_t.o \
-  $(CORBAOBJECTS)
+  md5.o            OIDtools.o       phrases.o        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)
@@ -126 +77 @@
 
 clean:
-    rm -f $(OBJECTS) gsdllib.a corbaiface_skel.mpp corbaiface.h corbaiface.mpp
+    rm -f $(OBJECTS) gsdllib.a
 
 distclean: clean