Fix library install.

Add target header directory to include directories.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2451 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
scottc 1997-09-26 07:04:24 +00:00
parent b29f0bb44e
commit cfc73c4697
4 changed files with 14 additions and 4 deletions

View file

@ -1,3 +1,10 @@
Thu Sep 25 23:31:30 1997 Scott Christley <scottc@net-community.com>
* library.make (internal-install-lib): Install correct file.
* common.make (GNUSTEP_TARGET_HEADERS): New variable.
* rules.make (ALL_OBJCFLAGS, ALL_CFLAGS): Add target header
directory to include directories.
Thu Sep 25 20:20:50 1997 Scott Christley <scottc@net-community.com>
* Makefile.in (config.site): Install in share directory not

View file

@ -60,6 +60,7 @@ include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/core.make
GNUSTEP_APPS = $(GNUSTEP_SYSTEM_ROOT)/Apps
GNUSTEP_TOOLS = $(GNUSTEP_SYSTEM_ROOT)/Tools
GNUSTEP_HEADERS = $(GNUSTEP_SYSTEM_ROOT)/Headers
GNUSTEP_TARGET_HEADERS = $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)
GNUSTEP_LIBRARIES_ROOT = $(GNUSTEP_SYSTEM_ROOT)/Libraries
GNUSTEP_LIBRARIES = $(GNUSTEP_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
GNUSTEP_RESOURCES = $(GNUSTEP_LIBRARIES_ROOT)/Resources

View file

@ -75,8 +75,8 @@ internal-install-libs:: internal-install-lib \
internal-install-import-lib
internal-install-lib::
if [ -e $(GNUSTEP_OBJ_DIR)/$(LIBRARY_FILE) ]; then \
$(INSTALL_PROGRAM) $(GNUSTEP_OBJ_DIR)/$(LIBRARY_FILE) \
if [ -e $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) ]; then \
$(INSTALL_PROGRAM) $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) \
$(GNUSTEP_LIBRARIES) ; \
$(AFTER_INSTALL_LIBRARY_CMD) \
fi

View file

@ -23,11 +23,13 @@ ALL_CPPFLAGS = $(CPPFLAGS) $(ADDITIONAL_CPPFLAGS)
ALL_OBJCFLAGS = $(INTERNAL_OBJCFLAGS) $(ADDITIONAL_OBJCFLAGS) \
$(ADDITIONAL_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \
$(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) -I$(GNUSTEP_HEADERS)
$(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \
-I$(GNUSTEP_TARGET_HEADERS) -I$(GNUSTEP_HEADERS)
ALL_CFLAGS = $(INTERNAL_CFLAGS) $(ADDITIONAL_CFLAGS) \
$(ADDITIONAL_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \
$(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) -I$(GNUSTEP_HEADERS)
$(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \
-I$(GNUSTEP_TARGET_HEADERS) -I$(GNUSTEP_HEADERS)
ALL_LDFLAGS = $(INTERNAL_LDFLAGS) $(ADDITIONAL_LDFLAGS) \
$(FND_LDFLAGS) $(GUI_LDFLAGS) $(BACKEND_LDFLAGS) \