Changeset 15907 for gsdl/trunk/src/oaiservr

Timestamp:

2008-06-09T12:58:10+12:00 (16 years ago)

Author:

mdewsnip

Message:

Moving "lib" directory into "src", to keep all the source code together. Not tested yet.

Location:

gsdl/trunk/src/oaiservr

Files:

• Makefile.in (modified) (2 diffs)
• win32.mak (modified) (2 diffs)

gsdl/trunk/src/oaiservr/Makefile.in

@@ -52 +52 @@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
-INCLUDES = -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text
+INCLUDES = -I$(GSDL_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text
 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
 LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
@@ -118 +118 @@
     $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
     $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
-    $(GSDL_DIR)/lib/gsdllib.a
+    $(GSDL_DIR)/src/lib/gsdllib.a
 
 EXECUTABLE_OBJECTS = \

gsdl/trunk/src/oaiservr/win32.mak

@@ -72 +72 @@
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
         -DGSDL_NOCACHE
-INCLUDES = -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
+INCLUDES = -I"$(GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
         -I"$(INDEXERS_DIR)\mgpp\text" -I"$(PACKAGES_DIR)\windows\crypt\crypt" \
     -I"$(PACKAGES_DIR)\windows\expat\expat" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm"
@@ -144 +144 @@
     "$(PROTOCOL_DIR)\gsdlprotocol.lib" \
     "$(COLSERVR_DIR)\gsdlcolservr.lib" \
-    "$(GSDL_DIR)\lib\gsdllib.lib" \
     "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \
     "$(INDEXERS_DIR)\mg\lib\libmglib.lib" \
     "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
-    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib"
+    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" \
+    "$(GSDL_DIR)\src\lib\gsdllib.lib"
 
 EXECUTABLE_OBJECTS = \