Applied patch from Adam Fedor

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@10277 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Philippe C.D. Robert 2001-07-01 19:01:27 +00:00
parent e1d2090c18
commit 5a35542c50
12 changed files with 29 additions and 25 deletions

View file

@ -25,7 +25,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
BUNDLE_NAME = PCAppProj BUNDLE_NAME = PCAppProj
BUNDLE_EXTENSION =.bundle BUNDLE_EXTENSION =.bundle
BUNDLE_INSTALL_DIR =$(GNUSTEP_LOCAL_ROOT)/Library/ProjectCenter/ BUNDLE_INSTALL_DIR =$(GNUSTEP_INSTALLATION_DIR)/Library/ProjectCenter/
PCAppProj_OBJC_FILES = \ PCAppProj_OBJC_FILES = \
PCAppProj.m \ PCAppProj.m \

View file

@ -49,16 +49,18 @@ ADDITIONAL_CFLAGS +=
#ADDITIONAL_CFLAGS += #ADDITIONAL_CFLAGS +=
# Additional include directories the compiler should search # Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += ADDITIONAL_INCLUDE_DIRS += -I../PCLib
# Additional LDFLAGS to pass to the linker # Additional LDFLAGS to pass to the linker
ADDITIONAL_LDFLAGS += -lProjectCenter #ADDITIONAL_LDFLAGS +=
# Additional library directories the linker should search # Additional library directories the linker should search
ADDITIONAL_LIB_DIRS += ADDITIONAL_LIB_DIRS += -L../PCLib/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_TOOL_LIBS += ADDITIONAL_TOOL_LIBS +=
PCAppProj_BUNDLE_LIBS = -lProjectCenter
# #
# Flags dealing with installing and uninstalling # Flags dealing with installing and uninstalling
# #

View file

@ -26,7 +26,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
BUNDLE_NAME = PCBaseFileTypes BUNDLE_NAME = PCBaseFileTypes
BUNDLE_EXTENSION =.bundle BUNDLE_EXTENSION =.bundle
PCBaseFileTypes_PRINCIPAL_CLASS = PCBaseFileType PCBaseFileTypes_PRINCIPAL_CLASS = PCBaseFileType
BUNDLE_INSTALL_DIR =$(GNUSTEP_LOCAL_ROOT)/Library/ProjectCenter/ BUNDLE_INSTALL_DIR =$(GNUSTEP_INSTALLATION_DIR)/Library/ProjectCenter/
PCBaseFileTypes_OBJC_FILES = \ PCBaseFileTypes_OBJC_FILES = \
PCBaseFileType.m PCBaseFileType.m

View file

@ -25,7 +25,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
BUNDLE_NAME = PCBundleProj BUNDLE_NAME = PCBundleProj
BUNDLE_EXTENSION =.bundle BUNDLE_EXTENSION =.bundle
BUNDLE_INSTALL_DIR =$(GNUSTEP_LOCAL_ROOT)/Library/ProjectCenter/ BUNDLE_INSTALL_DIR =$(GNUSTEP_INSTALLATION_DIR)/Library/ProjectCenter/
PCBundleProj_OBJC_FILES = \ PCBundleProj_OBJC_FILES = \
PCBundleProj.m \ PCBundleProj.m \

View file

@ -49,16 +49,18 @@ ADDITIONAL_CFLAGS +=
#ADDITIONAL_CFLAGS += #ADDITIONAL_CFLAGS +=
# Additional include directories the compiler should search # Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += ADDITIONAL_INCLUDE_DIRS += -I../PCLib
# Additional LDFLAGS to pass to the linker # Additional LDFLAGS to pass to the linker
ADDITIONAL_LDFLAGS += -lProjectCenter #ADDITIONAL_LDFLAGS +=
# Additional library directories the linker should search # Additional library directories the linker should search
ADDITIONAL_LIB_DIRS += ADDITIONAL_LIB_DIRS += -L../PCLib/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_TOOL_LIBS += ADDITIONAL_TOOL_LIBS +=
PCBundleProj_BUNDLE_LIBS = -lProjectCenter
# #
# Flags dealing with installing and uninstalling # Flags dealing with installing and uninstalling
# #

View file

@ -22,8 +22,7 @@
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. # Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
# #
# Install into the system root by default PCLIB_INSTALLATION_DIR = $(GNUSTEP_INSTALLATION_DIR)
PCLIB_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/common.make
@ -38,7 +37,7 @@ LIBRARY_VAR = PCLIB
# The library to be compiled # The library to be compiled
LIBRARY_NAME=libProjectCenter LIBRARY_NAME=libProjectCenter
PCLIB_INSTALL_PREFIX=$(GNUSTEP_LOCAL_ROOT) PCLIB_INSTALL_PREFIX=$(GNUSTEP_INSTALLATION_DIR)
# Grep for these names to build the legally-required "AUTHORS" file. # Grep for these names to build the legally-required "AUTHORS" file.
FILE_AUTHORS = \ FILE_AUTHORS = \
@ -97,5 +96,4 @@ libProjectCenter_HEADER_FILES = $(libProjectCenter_HFILES)
include $(GNUSTEP_MAKEFILES)/library.make include $(GNUSTEP_MAKEFILES)/library.make
-include GNUmakefile.postamble

View file

@ -58,7 +58,7 @@ ADDITIONAL_TOOL_LIBS +=
# #
# Additional directories to be created during installation # Additional directories to be created during installation
ADDITIONAL_INSTALL_DIRS = $(PCLIB_INSTALL_PREFIX)/Headers/ProjectCenter #ADDITIONAL_INSTALL_DIRS = $(PCLIB_INSTALL_PREFIX)/Headers/ProjectCenter
# #
# Local configuration # Local configuration

View file

@ -25,7 +25,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
BUNDLE_NAME = PCLibProj BUNDLE_NAME = PCLibProj
BUNDLE_EXTENSION=.bundle BUNDLE_EXTENSION=.bundle
BUNDLE_INSTALL_DIR=$(GNUSTEP_LOCAL_ROOT)/Library/ProjectCenter/ BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/ProjectCenter/
PCLibProj_OBJC_FILES = \ PCLibProj_OBJC_FILES = \
PCLibProj.m \ PCLibProj.m \

View file

@ -49,13 +49,13 @@ ADDITIONAL_CFLAGS +=
#ADDITIONAL_CFLAGS += #ADDITIONAL_CFLAGS +=
# Additional include directories the compiler should search # Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += ADDITIONAL_INCLUDE_DIRS += -I../PCLib
# Additional LDFLAGS to pass to the linker # Additional LDFLAGS to pass to the linker
ADDITIONAL_LDFLAGS += ADDITIONAL_LDFLAGS +=
# Additional library directories the linker should search # Additional library directories the linker should search
ADDITIONAL_LIB_DIRS += ADDITIONAL_LIB_DIRS += -L../PCLib/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_TOOL_LIBS += ADDITIONAL_TOOL_LIBS +=

View file

@ -25,7 +25,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
BUNDLE_NAME = PCToolProj BUNDLE_NAME = PCToolProj
BUNDLE_EXTENSION =.bundle BUNDLE_EXTENSION =.bundle
BUNDLE_INSTALL_DIR =$(GNUSTEP_LOCAL_ROOT)/Library/ProjectCenter/ BUNDLE_INSTALL_DIR =$(GNUSTEP_INSTALLATION_DIR)/Library/ProjectCenter/
PCToolProj_OBJC_FILES = \ PCToolProj_OBJC_FILES = \
PCToolProj.m \ PCToolProj.m \

View file

@ -49,16 +49,18 @@ ADDITIONAL_CFLAGS +=
#ADDITIONAL_CFLAGS += #ADDITIONAL_CFLAGS +=
# Additional include directories the compiler should search # Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += ADDITIONAL_INCLUDE_DIRS += -I../PCLib
# Additional LDFLAGS to pass to the linker # Additional LDFLAGS to pass to the linker
ADDITIONAL_LDFLAGS += -lProjectCenter #ADDITIONAL_LDFLAGS +=
# Additional library directories the linker should search # Additional library directories the linker should search
ADDITIONAL_LIB_DIRS += ADDITIONAL_LIB_DIRS += -L../PCLib/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_TOOL_LIBS += ADDITIONAL_TOOL_LIBS +=
PCToolProj_BUNLDE_LIBS = -lProjectCenter
# #
# Flags dealing with installing and uninstalling # Flags dealing with installing and uninstalling
# #

View file

@ -49,13 +49,13 @@ ADDITIONAL_CFLAGS +=
#ADDITIONAL_CFLAGS += #ADDITIONAL_CFLAGS +=
# Additional include directories the compiler should search # Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += ADDITIONAL_INCLUDE_DIRS += -I../PCLib
# Additional LDFLAGS to pass to the linker # Additional LDFLAGS to pass to the linker
ADDITIONAL_LDFLAGS += -lProjectCenter #ADDITIONAL_LDFLAGS +=
# Additional library directories the linker should search # Additional library directories the linker should search
ADDITIONAL_LIB_DIRS += ADDITIONAL_LIB_DIRS += -L../PCLib/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_TOOL_LIBS += ADDITIONAL_TOOL_LIBS +=