continuing merging...

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@24243 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Sergii Stoian 2006-12-26 11:10:53 +00:00
parent f113470a11
commit 62f062f726
4 changed files with 5 additions and 8 deletions

View file

@ -2,9 +2,8 @@
# GNUmakefile - Generated by ProjectCenter
#
GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
include $(GNUSTEP_MAKEFILES)/common.make
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
#
# Framework

View file

@ -2,9 +2,9 @@
# GNUmakefile
#
GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
include $(GNUSTEP_MAKEFILES)/common.make
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
#GNUSTEP_BUILD_DIR = $(HOME)/Projects/GNUstep/==BUILD==/ProjectCenter
#
# Main application
@ -18,7 +18,7 @@ ProjectCenter_APPLICATION_ICON = Images/ProjectCenter.tiff
# Subprojects
#
SUBPROJECTS = \
Library \
Framework \
Modules
#

View file

@ -18,8 +18,6 @@
#
include $(GNUSTEP_MAKEFILES)/common.make
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
#
# Subprojects

View file

@ -5,7 +5,7 @@ ADDITIONAL_OBJCFLAGS +=
ADDITIONAL_CFLAGS +=
ADDITIONAL_CPPFLAGS +=
ADDITIONAL_INCLUDE_DIRS += -I../../../ -I../../../Headers
ADDITIONAL_LIB_DIRS += -L../../../Library/ProjectCenter.framework/Versions/Current
ADDITIONAL_LIB_DIRS += -L../../../Framework/ProjectCenter.framework/Versions/Current
BUNDLE_INSTALL_DIR = $(GNUSTEP_SYSTEM_ROOT)/Applications/ProjectCenter.app/Resources
# $(BUNDLE_NAME)_STANDARD_INSTALL = no
@ -18,7 +18,7 @@ ifeq ($(GNUSTEP_TARGET_OS), cygwin)
DO_LIB_LINK=yes
endif
ifeq ($(DO_LIB_LINK), yes)
$(GNUSTEP_INSTANCE)_LIB_DIRS += -L../../../Library/ProjectCenter.framework
$(GNUSTEP_INSTANCE)_LIB_DIRS += -L../../../Framework/ProjectCenter.framework
$(GNUSTEP_INSTANCE)_BUNDLE_LIBS += -lProjectCenter
endif