Changeset 15578
- Timestamp:
- 2008-05-19T15:43:00+12:00 (16 years ago)
- Location:
- gsdl/trunk/src/corba
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/src/corba
-
Property svn:ignore
set to
corbarecptldd
corbaserver
-
Property svn:ignore
set to
-
gsdl/trunk/src/corba/Makefile.in
r15576 r15578 30 30 COLSERVR_DIR = $(GSDL_DIR)/src/colservr 31 31 PROTOCOL_DIR = $(GSDL_DIR)/src/protocol 32 RECPT_DIR = $(GSDL_DIR)/src/recpt 32 33 33 34 … … 38 39 ACCENTFOLD_LIBS = 39 40 endif 40 41 USE_CORBA = @USE_CORBA@42 ifeq ($(USE_CORBA), 1)43 41 44 42 MICO_DIR = @MICO_DIR@ … … 56 54 endif 57 55 58 56 USE_CORBA = @USE_CORBA@ 57 ifeq ($(USE_CORBA), 1) 59 58 AR = ar 60 59 CC = @CC@ 61 60 CFLAGS = @CFLAGS@ 62 61 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER 63 # Do NOT add the "recpt" directory here: the CORBA code should be independent of the receptionist! 64 INCLUDES = -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(INDEXERS_DIR)/mgpp/text$(MICO_INCLUDES)62 INCLUDES = -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text \ 63 $(MICO_INCLUDES) 65 64 INSTALL = @INSTALL@ 66 65 LDFLAGS = @LDFLAGS@ … … 84 83 corbaiface_skel.mpp \ 85 84 corbaproto.mpp \ 86 corbaServer.mpp \87 85 corbatext_t.mpp 88 86 … … 92 90 corbaiface_skel.o \ 93 91 corbaproto.o \ 94 corbaServer.o \95 92 corbatext_t.o 96 93 94 CORBASERVER_OBJECTS = \ 95 corbaServer.o 96 97 CORBARECPT_OBJECTS = \ 98 corbaclient.o 99 97 100 GSDL_LIBS = \ 101 $(RECPT_DIR)/gsdlrecpt.a \ 98 102 $(PROTOCOL_DIR)/gsdlprotocol.a \ 99 103 $(COLSERVR_DIR)/gsdlcolservr.a \ … … 104 108 $(GSDL_DIR)/lib/gsdllib.a 105 109 106 EXECUTABLE_OBJECTS = \110 CORBASERVER_EXECUTABLE_OBJECTS = \ 107 111 $(OBJECTS) \ 112 $(CORBASERVER_OBJECTS) \ 108 113 $(GSDL_LIBS) 109 114 110 EXECUTABLE = corbaserver 115 CORBARECPT_EXECUTABLE_OBJECTS = \ 116 $(OBJECTS) \ 117 $(CORBARECPT_OBJECTS) \ 118 $(GSDL_LIBS) 111 119 112 corbaserver: $(EXECUTABLE_OBJECTS) 113 $(LINK) $(EXECUTABLE_OBJECTS) $(LIBS) 114 115 all: $(EXECUTABLE) 120 EXECUTABLES = corbaserver corbarecptldd 116 121 117 122 123 # Default target: make both corbaserver and corbarecptldd 124 all: $(EXECUTABLES) 118 125 119 126 120 # CORBARECPT_OBJECTS = corbaproto.o corbaclient.o 127 corbaserver: $(CORBASERVER_EXECUTABLE_OBJECTS) 128 $(LINK) $(CORBASERVER_EXECUTABLE_OBJECTS) $(LIBS) 121 129 122 # CORBARECPT_OBJS = $(COMMONOBJECTS) $(CORBARECPT_OBJECTS) $(COLSERVROBJECTS) \ 123 # ../../lib/corbaiface.o \ 124 # ../../lib/corbaiface_skel.o \ 125 # ../../lib/corbaconv_text_t.o \ 126 # ../../lib/corbatext_t.o \ 127 # ../../lib/gsdllib.a \ 128 # $(INDEXERS_DIR)/mg/src/text/libmgtext.a \ 129 # $(INDEXERS_DIR)/mg/lib/libmglib.a \ 130 # $(FASTCGI_OBJS) \ 131 # $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \ 132 # $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a 130 corbarecptldd: $(CORBARECPT_EXECUTABLE_OBJECTS) 131 $(LINK) $(CORBARECPT_EXECUTABLE_OBJECTS) $(LIBS) 133 132 134 133 135 # corbarecptldd: $(CORBARECPT_OBJS) 136 # @echo -e building corbarecptldd: 137 # $(LINK) $(CORBARECPT_OBJS) $(MLIBS) 134 install: 135 136 clean: 137 rm -f $(OBJECTS) $(CORBASERVER_OBJECTS) $(CORBARECPT_OBJECTS) $(EXECUTABLES) 138 139 distclean: 140 rm -f $(OBJECTS) $(CORBASERVER_OBJECTS) $(CORBARECPT_OBJECTS) $(EXECUTABLES) Makefile 141 142 depend: 143 makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES) 138 144 139 145 else
Note:
See TracChangeset
for help on using the changeset viewer.