Install libs to /usr/lib

[scalable-opengroupware.org] / OGoContentStore / GNUmakefile.preamble

diff --git a/OGoContentStore/GNUmakefile.preamble b/OGoContentStore/GNUmakefile.preamble
index 6974d977d24603694c9196b9e2f50b55e74e9b22..e39140e3f58e565fce0169173fb65a0a53c54183 100644 (file)
--- a/OGoContentStore/GNUmakefile.preamble
+++ b/OGoContentStore/GNUmakefile.preamble
@@ -1,26 +1,30 @@
-# $Id$
+# compilation settings
 
 libOGoContentStore_LIBRARIES_DEPEND_UPON += \
+       -lGDLContentStore       \
        -lGDLAccess     \
+       -lNGCards       \
+       -lNGExtensions  \
        -lEOControl     \
        -lSaxObjC
 
-OCS_TOOL_LIBS += \
-       -lOGoContentStore       \
-       -lGDLAccess             \
-       -lNGExtensions -lEOControl      \
-       -lDOM -lSaxObjC
-
-ocs_ls_TOOL_LIBS            += $(OCS_TOOL_LIBS)
-ocs_mkdir_TOOL_LIBS         += $(OCS_TOOL_LIBS)
-ocs_cat_TOOL_LIBS           += $(OCS_TOOL_LIBS)
-ocs_recreatequick_TOOL_LIBS += $(OCS_TOOL_LIBS)
+ADDITIONAL_INCLUDE_DIRS += -I. -I.. -I../SOPE
 
-ADDITIONAL_INCLUDE_DIRS += -I. -I..
+ADDITIONAL_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR) -L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/
 
-ADDITIONAL_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR)
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
 ifeq ($(FOUNDATION_LIB),apple)
 libOGoContentStore_PREBIND_ADDR="0xC7700000"
 libOGoContentStore_LDFLAGS += -seg1addr $(libOGoContentStore_PREBIND_ADDR)
 endif
+
+test_quick_extract_TOOL_LIBS += \
+       -lEOControl             \
+       -lSaxObjC               \
+       -lDOM                   \
+       -lNGExtensions          \
+       -lNGCards               \
+       -lGDLContentStore       \
+       -lGDLAccess             \
+       -lOGoContentStore