Changeset 15907 for gsdl/trunk/src/recpt

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/recpt

Files:

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

gsdl/trunk/src/recpt/Makefile.in

@@ -76 +76 @@
 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(Z3950_DEFS)
-INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib \
+INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/src/lib \
         -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
     -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mgpp/text \
@@ -194 +194 @@
     $(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/recpt/win32.mak

@@ -83 +83 @@
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
         -DGSDL_NOCACHE $(Z3950_DEFS)
-INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
+INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
     -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mgpp\text" \
     -I"$(PACKAGES_DIR)\windows\crypt\crypt" -I"$(PACKAGES_DIR)\windows\expat\expat" \
@@ -205 +205 @@
     "$(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 = \