mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
Fix last change.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@8672 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
fc1f301a38
commit
dee5b3058e
4 changed files with 47 additions and 24 deletions
|
|
@ -1,3 +1,11 @@
|
|||
2001-01-17 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* library.make: Revert last change, add LIBRARY_INSTALL_DIR
|
||||
which replaces GNUSTEP_LIBRARIES.
|
||||
* target.make: Replace GNUSTEP_LIBRARIES with LIBRARY_INSTALL_DIR.
|
||||
|
||||
* source-distribution.make: Add cvs-dist and cvs-snapshot targets
|
||||
|
||||
Wed Jan 17 17:19:58 2001 Nicola Pero <nicola@brainstorm.co.uk>
|
||||
|
||||
* rpm.make: GNUSTEP_BASE_INSTALL changed to INSTALL_ROOT_DIR since
|
||||
|
|
|
|||
40
library.make
40
library.make
|
|
@ -91,8 +91,8 @@ else
|
|||
|
||||
# This is the directory where the libs get installed. Normally this
|
||||
# includes the target arch and os directory and library_combo.
|
||||
ifeq ($(LIBRARY_OBJ_DIR),)
|
||||
LIBRARY_OBJ_DIR = $(GNUSTEP_OBJ_DIR)
|
||||
ifeq ($(LIBRARY_INSTALL_DIR),)
|
||||
LIBRARY_INSTALL_DIR = $(GNUSTEP_LIBRARIES)
|
||||
endif
|
||||
|
||||
ifeq ($(shared), yes)
|
||||
|
|
@ -157,8 +157,8 @@ internal-library-all :: \
|
|||
$(GNUSTEP_OBJ_DIR) \
|
||||
$(DERIVED_SOURCES) \
|
||||
$(DERIVED_SOURCES)/$(INTERNAL_library_NAME).def \
|
||||
$(LIBRARY_OBJ_DIR)/$(DLL_NAME) \
|
||||
$(LIBRARY_OBJ_DIR)/$(DLL_EXP_LIB) \
|
||||
$(GNUSTEP_OBJ_DIR)/$(DLL_NAME) \
|
||||
$(GNUSTEP_OBJ_DIR)/$(DLL_EXP_LIB) \
|
||||
after-$(TARGET)-all
|
||||
|
||||
internal-library-clean ::
|
||||
|
|
@ -172,10 +172,10 @@ DLL_OFILES = $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(OBJ_FILES) $(SUBPROJECT_OBJ_FILE
|
|||
$(DERIVED_SOURCES)/$(INTERNAL_library_NAME).def : $(DLL_OFILES) $(DLL_DEF)
|
||||
$(DLLTOOL) $(DLL_DEF_FLAG) --output-def $@ $(DLL_OFILES)
|
||||
|
||||
$(LIBRARY_OBJ_DIR)/$(DLL_EXP_LIB) : $(DERIVED_SOURCES)/$(INTERNAL_library_NAME).def
|
||||
$(GNUSTEP_OBJ_DIR)/$(DLL_EXP_LIB) : $(DERIVED_SOURCES)/$(INTERNAL_library_NAME).def
|
||||
$(DLLTOOL) --dllname $(DLL_NAME) --def $< --output-lib $@
|
||||
|
||||
$(LIBRARY_OBJ_DIR)/$(DLL_NAME) : $(DLL_OFILES) $(DERIVED_SOURCES)/$(INTERNAL_library_NAME).def
|
||||
$(GNUSTEP_OBJ_DIR)/$(DLL_NAME) : $(DLL_OFILES) $(DERIVED_SOURCES)/$(INTERNAL_library_NAME).def
|
||||
$(DLLWRAP) --driver-name $(CC) \
|
||||
$(SHARED_LD_PREFLAGS) \
|
||||
--def $(DERIVED_SOURCES)/$(INTERNAL_library_NAME).def \
|
||||
|
|
@ -186,10 +186,10 @@ $(LIBRARY_OBJ_DIR)/$(DLL_NAME) : $(DLL_OFILES) $(DERIVED_SOURCES)/$(INTERNAL_lib
|
|||
else # BUILD_DLL
|
||||
|
||||
internal-library-all:: before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
|
||||
$(LIBRARY_OBJ_DIR)/$(VERSION_LIBRARY_FILE) import-library \
|
||||
$(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) import-library \
|
||||
after-$(TARGET)-all
|
||||
|
||||
$(LIBRARY_OBJ_DIR)/$(VERSION_LIBRARY_FILE): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
|
||||
$(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
|
||||
$(LIB_LINK_CMD)
|
||||
|
||||
endif # BUILD_DLL
|
||||
|
|
@ -227,21 +227,21 @@ internal-install-headers::
|
|||
ifeq ($(BUILD_DLL),yes)
|
||||
|
||||
internal-install-lib::
|
||||
if [ -f $(LIBRARY_OBJ_DIR)/$(DLL_NAME) ]; then \
|
||||
$(INSTALL_PROGRAM) $(LIBRARY_OBJ_DIR)/$(DLL_NAME) \
|
||||
if [ -f $(GNUSTEP_OBJ_DIR)/$(DLL_NAME) ]; then \
|
||||
$(INSTALL_PROGRAM) $(GNUSTEP_OBJ_DIR)/$(DLL_NAME) \
|
||||
$(DLL_INSTALLATION_DIR) ; \
|
||||
fi
|
||||
if [ -f $(LIBRARY_OBJ_DIR)/$(DLL_EXP_LIB) ]; then \
|
||||
$(INSTALL_PROGRAM) $(LIBRARY_OBJ_DIR)/$(DLL_EXP_LIB) \
|
||||
$(GNUSTEP_LIBRARIES) ; \
|
||||
if [ -f $(GNUSTEP_OBJ_DIR)/$(DLL_EXP_LIB) ]; then \
|
||||
$(INSTALL_PROGRAM) $(GNUSTEP_OBJ_DIR)/$(DLL_EXP_LIB) \
|
||||
$(LIBRARY_INSTALL_DIR) ; \
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
internal-install-lib::
|
||||
if [ -f $(LIBRARY_OBJ_DIR)/$(VERSION_LIBRARY_FILE) ]; then \
|
||||
$(INSTALL_PROGRAM) $(LIBRARY_OBJ_DIR)/$(VERSION_LIBRARY_FILE) \
|
||||
$(GNUSTEP_LIBRARIES) ; \
|
||||
if [ -f $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) ]; then \
|
||||
$(INSTALL_PROGRAM) $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) \
|
||||
$(LIBRARY_INSTALL_DIR) ; \
|
||||
$(AFTER_INSTALL_LIBRARY_CMD) \
|
||||
fi
|
||||
|
||||
|
|
@ -262,13 +262,13 @@ ifeq ($(BUILD_DLL),yes)
|
|||
|
||||
internal-uninstall-lib::
|
||||
rm -f $(DLL_INSTALLATION_DIR)/$(DLL_NAME)
|
||||
rm -f $(GNUSTEP_LIBRARIES)/$(DLL_EXP_LIB)
|
||||
rm -f $(LIBRARY_INSTALL_DIR)/$(DLL_EXP_LIB)
|
||||
|
||||
else
|
||||
|
||||
internal-uninstall-lib::
|
||||
rm -f $(GNUSTEP_LIBRARIES)/$(VERSION_LIBRARY_FILE)
|
||||
rm -f $(GNUSTEP_LIBRARIES)/$(LIBRARY_FILE)
|
||||
rm -f $(LIBRARY_INSTALL_DIR)/$(VERSION_LIBRARY_FILE)
|
||||
rm -f $(LIBRARY_INSTALL_DIR)/$(LIBRARY_FILE)
|
||||
|
||||
endif
|
||||
|
||||
|
|
@ -278,7 +278,7 @@ internal-uninstall-import-lib::
|
|||
# Cleaning targets
|
||||
#
|
||||
internal-library-clean::
|
||||
rm -rf $(LIBRARY_OBJ_DIR)
|
||||
rm -rf $(GNUSTEP_OBJ_DIR)
|
||||
|
||||
internal-library-distclean::
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
|
|
|
|||
|
|
@ -31,6 +31,9 @@
|
|||
ifeq ($(TGZ_MAKE_LOADED),)
|
||||
TGZ_MAKE_LOADED=yes
|
||||
|
||||
# Striped package name, probably only useful for GNUstep libraries
|
||||
PDIR_NAME = $(subst gnustep-,,$(PACKAGE_NAME))
|
||||
|
||||
#
|
||||
# Build a .tgz with the whole directory tree
|
||||
#
|
||||
|
|
@ -47,6 +50,18 @@ tgz: distclean
|
|||
mv $(PACKAGE_NAME)-$(VERSION) $$SNAPSHOT_DIR; \
|
||||
fi;
|
||||
|
||||
cvs-dist:
|
||||
cvs -z3 export -r $(PDIR_NAME)-$(VERTAG) $(PDIR_NAME)
|
||||
mv $(PDIR_NAME) $(PACKAGE_NAME)-$(VERSION)
|
||||
tar --gzip -cf $(PACKAGE_NAME)-$(VERSION).tar.gz $(PACKAGE_NAME)-$(VERSION)
|
||||
rm -rf $(PACKAGE_NAME)-$(VERSION)
|
||||
|
||||
cvs-snapshot:
|
||||
cvs -z3 export -D now $(PDIR_NAME)
|
||||
mv $(PDIR_NAME) $(PACKAGE_NAME)-$(VERSION)
|
||||
tar --gzip -cf $(PACKAGE_NAME)-$(VERSION).tar.gz $(PACKAGE_NAME)-$(VERSION)
|
||||
rm -rf $(PACKAGE_NAME)-$(VERSION)
|
||||
|
||||
endif
|
||||
# source-distribution.make loaded
|
||||
|
||||
|
|
|
|||
|
|
@ -99,12 +99,12 @@ STATIC_LIB_LINK_CMD = \
|
|||
$(AR) $(ARFLAGS) $(AROUT)$(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^;\
|
||||
$(RANLIB) $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE)
|
||||
AFTER_INSTALL_STATIC_LIB_COMMAND = \
|
||||
(cd $(GNUSTEP_LIBRARIES); $(RANLIB) $(VERSION_LIBRARY_FILE))
|
||||
(cd $(LIBRARY_INSTALL_DIR); $(RANLIB) $(VERSION_LIBRARY_FILE))
|
||||
SHARED_LIB_LINK_CMD =
|
||||
SHARED_CFLAGS =
|
||||
SHARED_LIBEXT =
|
||||
AFTER_INSTALL_SHARED_LIB_COMMAND = \
|
||||
(cd $(GNUSTEP_LIBRARIES); \
|
||||
(cd $(LIBRARY_INSTALL_DIR); \
|
||||
rm -f $(LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
HAVE_BUNDLES = no
|
||||
|
|
@ -398,7 +398,7 @@ SHARED_FRAMEWORK_LINK_CMD = \
|
|||
rm -f $(FRAMEWORK_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
|
||||
AFTER_INSTALL_SHARED_LIB_COMMAND = \
|
||||
(cd $(GNUSTEP_LIBRARIES); \
|
||||
(cd $(LIBRARY_INSTALL_DIR); \
|
||||
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
|
||||
|
|
@ -814,7 +814,7 @@ SHARED_FRAMEWORK_LINK_CMD = \
|
|||
rm -f $(FRAMEWORK_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
|
||||
AFTER_INSTALL_SHARED_LIB_COMMAND = \
|
||||
(cd $(GNUSTEP_LIBRARIES); \
|
||||
(cd $(LIBRARY_INSTALL_DIR); \
|
||||
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
|
||||
|
|
|
|||
Loading…
Reference in a new issue