some code cleanups

[sope] / sope-ldap / NGLdap / GNUmakefile

diff --git a/sope-ldap/NGLdap/GNUmakefile b/sope-ldap/NGLdap/GNUmakefile
index d50d1390ac9dbd7f95322179e7a683ab1f44aa12..24b16485376a5344bd443bc869457fb5b2ddb6a6 100644 (file)
--- a/sope-ldap/NGLdap/GNUmakefile
+++ b/sope-ldap/NGLdap/GNUmakefile
@@ -1,31 +1,38 @@
-# $Id$
+# GNUstep makefile
 
-include ../common.make
+-include ../../config.make
+include $(GNUSTEP_MAKEFILES)/common.make
+include ./Version
 
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
 
+ifneq ($(frameworks),yes)
 LIBRARY_NAME = libNGLdap
+else
+FRAMEWORK_NAME = NGLdap
+endif
 
+libNGLdap_PCH_FILE = common.h
 libNGLdap_HEADER_FILES_DIR         = .
 libNGLdap_HEADER_FILES_INSTALL_DIR = /NGLdap
-
 libNGLdap_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libNGLdap_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 
 libNGLdap_HEADER_FILES = \
-       NGLdap.h                \
+       NGLdap.h                        \
        \
-       EOQualifier+LDAP.h      \
-       NSString+DN.h           \
-       NGLdapEntry.h           \
-       NGLdapConnection.h      \
-       NGLdapAttribute.h       \
-       NGLdapModification.h    \
+       EOQualifier+LDAP.h              \
+       NSString+DN.h                   \
+       NGLdapEntry.h                   \
+       NGLdapConnection.h              \
+       NGLdapAttribute.h               \
+       NGLdapModification.h            \
        NGLdapSearchResultEnumerator.h  \
        \
-       NGLdapURL.h             \
-       NGLdapGlobalID.h        \
-       NGLdapFileManager.h     \
-       NGLdapDataSource.h      \
+       NGLdapURL.h                     \
+       NGLdapGlobalID.h                \
+       NGLdapFileManager.h             \
+       NGLdapDataSource.h              \
 
 libNGLdap_CORE_OBJC_FILES = \
        EOQualifier+LDAP.m              \
@@ -43,9 +50,21 @@ libNGLdap_OBJC_FILES = \
        NGLdapGlobalID.m                \
        NGLdapFileManager.m             \
 
+
+# framework support
+
+NGLdap_PCH_FILE     = $(libNGLdap_PCH_FILE)
+NGLdap_HEADER_FILES = $(libNGLdap_HEADER_FILES)
+NGLdap_OBJC_FILES   = $(libNGLdap_OBJC_FILES)
+
+
+# building
+
 -include GNUmakefile.preamble
+ifneq ($(frameworks),yes)
 include $(GNUSTEP_MAKEFILES)/library.make
+else
+include $(GNUSTEP_MAKEFILES)/framework.make
+endif
 -include GNUmakefile.postamble
-
-autodoc :
-       autodoc $(AUTODOC_FLAGS) -dest ../Documentation/NGLdap/ -proj .
+-include fhs.make