From 5a35542c506634c8dbfb13416a47471bece07f29 Mon Sep 17 00:00:00 2001 From: "Philippe C.D. Robert" Date: Sun, 1 Jul 2001 19:01:27 +0000 Subject: [PATCH] Applied patch from Adam Fedor git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@10277 72102866-910b-0410-8b05-ffd578937521 --- PCAppProj/GNUmakefile | 2 +- PCAppProj/GNUmakefile.preamble | 8 +++++--- PCBaseFileTypes/GNUmakefile | 2 +- PCBundleProj/GNUmakefile | 2 +- PCBundleProj/GNUmakefile.preamble | 8 +++++--- PCLib/GNUmakefile | 8 +++----- PCLib/GNUmakefile.preamble | 2 +- PCLibProj/GNUmakefile | 2 +- PCLibProj/GNUmakefile.preamble | 4 ++-- PCToolProj/GNUmakefile | 2 +- PCToolProj/GNUmakefile.preamble | 8 +++++--- ProjectCenter/GNUmakefile.preamble | 6 +++--- 12 files changed, 29 insertions(+), 25 deletions(-) diff --git a/PCAppProj/GNUmakefile b/PCAppProj/GNUmakefile index 7be9c50..aecc81d 100644 --- a/PCAppProj/GNUmakefile +++ b/PCAppProj/GNUmakefile @@ -25,7 +25,7 @@ include $(GNUSTEP_MAKEFILES)/common.make BUNDLE_NAME = PCAppProj BUNDLE_EXTENSION =.bundle -BUNDLE_INSTALL_DIR =$(GNUSTEP_LOCAL_ROOT)/Library/ProjectCenter/ +BUNDLE_INSTALL_DIR =$(GNUSTEP_INSTALLATION_DIR)/Library/ProjectCenter/ PCAppProj_OBJC_FILES = \ PCAppProj.m \ diff --git a/PCAppProj/GNUmakefile.preamble b/PCAppProj/GNUmakefile.preamble index 49b00fc..f271c87 100644 --- a/PCAppProj/GNUmakefile.preamble +++ b/PCAppProj/GNUmakefile.preamble @@ -49,16 +49,18 @@ ADDITIONAL_CFLAGS += #ADDITIONAL_CFLAGS += # Additional include directories the compiler should search -ADDITIONAL_INCLUDE_DIRS += +ADDITIONAL_INCLUDE_DIRS += -I../PCLib # Additional LDFLAGS to pass to the linker -ADDITIONAL_LDFLAGS += -lProjectCenter +#ADDITIONAL_LDFLAGS += # Additional library directories the linker should search -ADDITIONAL_LIB_DIRS += +ADDITIONAL_LIB_DIRS += -L../PCLib/$(GNUSTEP_OBJ_DIR) ADDITIONAL_TOOL_LIBS += +PCAppProj_BUNDLE_LIBS = -lProjectCenter + # # Flags dealing with installing and uninstalling # diff --git a/PCBaseFileTypes/GNUmakefile b/PCBaseFileTypes/GNUmakefile index 0a65782..bfda9c6 100644 --- a/PCBaseFileTypes/GNUmakefile +++ b/PCBaseFileTypes/GNUmakefile @@ -26,7 +26,7 @@ include $(GNUSTEP_MAKEFILES)/common.make BUNDLE_NAME = PCBaseFileTypes BUNDLE_EXTENSION =.bundle PCBaseFileTypes_PRINCIPAL_CLASS = PCBaseFileType -BUNDLE_INSTALL_DIR =$(GNUSTEP_LOCAL_ROOT)/Library/ProjectCenter/ +BUNDLE_INSTALL_DIR =$(GNUSTEP_INSTALLATION_DIR)/Library/ProjectCenter/ PCBaseFileTypes_OBJC_FILES = \ PCBaseFileType.m diff --git a/PCBundleProj/GNUmakefile b/PCBundleProj/GNUmakefile index b2a0e1c..d3f2fad 100644 --- a/PCBundleProj/GNUmakefile +++ b/PCBundleProj/GNUmakefile @@ -25,7 +25,7 @@ include $(GNUSTEP_MAKEFILES)/common.make BUNDLE_NAME = PCBundleProj BUNDLE_EXTENSION =.bundle -BUNDLE_INSTALL_DIR =$(GNUSTEP_LOCAL_ROOT)/Library/ProjectCenter/ +BUNDLE_INSTALL_DIR =$(GNUSTEP_INSTALLATION_DIR)/Library/ProjectCenter/ PCBundleProj_OBJC_FILES = \ PCBundleProj.m \ diff --git a/PCBundleProj/GNUmakefile.preamble b/PCBundleProj/GNUmakefile.preamble index 49b00fc..758efdf 100644 --- a/PCBundleProj/GNUmakefile.preamble +++ b/PCBundleProj/GNUmakefile.preamble @@ -49,16 +49,18 @@ ADDITIONAL_CFLAGS += #ADDITIONAL_CFLAGS += # Additional include directories the compiler should search -ADDITIONAL_INCLUDE_DIRS += +ADDITIONAL_INCLUDE_DIRS += -I../PCLib # Additional LDFLAGS to pass to the linker -ADDITIONAL_LDFLAGS += -lProjectCenter +#ADDITIONAL_LDFLAGS += # Additional library directories the linker should search -ADDITIONAL_LIB_DIRS += +ADDITIONAL_LIB_DIRS += -L../PCLib/$(GNUSTEP_OBJ_DIR) ADDITIONAL_TOOL_LIBS += +PCBundleProj_BUNDLE_LIBS = -lProjectCenter + # # Flags dealing with installing and uninstalling # diff --git a/PCLib/GNUmakefile b/PCLib/GNUmakefile index ac46ce9..e0ca29c 100644 --- a/PCLib/GNUmakefile +++ b/PCLib/GNUmakefile @@ -22,8 +22,7 @@ # Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA. # -# Install into the system root by default -PCLIB_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT) +PCLIB_INSTALLATION_DIR = $(GNUSTEP_INSTALLATION_DIR) GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles include $(GNUSTEP_MAKEFILES)/common.make @@ -38,7 +37,7 @@ LIBRARY_VAR = PCLIB # The library to be compiled 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. FILE_AUTHORS = \ @@ -97,5 +96,4 @@ libProjectCenter_HEADER_FILES = $(libProjectCenter_HFILES) include $(GNUSTEP_MAKEFILES)/library.make - - +-include GNUmakefile.postamble diff --git a/PCLib/GNUmakefile.preamble b/PCLib/GNUmakefile.preamble index d878583..4d7283a 100644 --- a/PCLib/GNUmakefile.preamble +++ b/PCLib/GNUmakefile.preamble @@ -58,7 +58,7 @@ ADDITIONAL_TOOL_LIBS += # # 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 diff --git a/PCLibProj/GNUmakefile b/PCLibProj/GNUmakefile index 4bab216..a93bccf 100644 --- a/PCLibProj/GNUmakefile +++ b/PCLibProj/GNUmakefile @@ -25,7 +25,7 @@ include $(GNUSTEP_MAKEFILES)/common.make BUNDLE_NAME = PCLibProj BUNDLE_EXTENSION=.bundle -BUNDLE_INSTALL_DIR=$(GNUSTEP_LOCAL_ROOT)/Library/ProjectCenter/ +BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/ProjectCenter/ PCLibProj_OBJC_FILES = \ PCLibProj.m \ diff --git a/PCLibProj/GNUmakefile.preamble b/PCLibProj/GNUmakefile.preamble index ce01357..46e487e 100644 --- a/PCLibProj/GNUmakefile.preamble +++ b/PCLibProj/GNUmakefile.preamble @@ -49,13 +49,13 @@ ADDITIONAL_CFLAGS += #ADDITIONAL_CFLAGS += # Additional include directories the compiler should search -ADDITIONAL_INCLUDE_DIRS += +ADDITIONAL_INCLUDE_DIRS += -I../PCLib # Additional LDFLAGS to pass to the linker ADDITIONAL_LDFLAGS += # Additional library directories the linker should search -ADDITIONAL_LIB_DIRS += +ADDITIONAL_LIB_DIRS += -L../PCLib/$(GNUSTEP_OBJ_DIR) ADDITIONAL_TOOL_LIBS += diff --git a/PCToolProj/GNUmakefile b/PCToolProj/GNUmakefile index 58a3f91..6f1bb26 100644 --- a/PCToolProj/GNUmakefile +++ b/PCToolProj/GNUmakefile @@ -25,7 +25,7 @@ include $(GNUSTEP_MAKEFILES)/common.make BUNDLE_NAME = PCToolProj BUNDLE_EXTENSION =.bundle -BUNDLE_INSTALL_DIR =$(GNUSTEP_LOCAL_ROOT)/Library/ProjectCenter/ +BUNDLE_INSTALL_DIR =$(GNUSTEP_INSTALLATION_DIR)/Library/ProjectCenter/ PCToolProj_OBJC_FILES = \ PCToolProj.m \ diff --git a/PCToolProj/GNUmakefile.preamble b/PCToolProj/GNUmakefile.preamble index 49b00fc..9960f85 100644 --- a/PCToolProj/GNUmakefile.preamble +++ b/PCToolProj/GNUmakefile.preamble @@ -49,16 +49,18 @@ ADDITIONAL_CFLAGS += #ADDITIONAL_CFLAGS += # Additional include directories the compiler should search -ADDITIONAL_INCLUDE_DIRS += +ADDITIONAL_INCLUDE_DIRS += -I../PCLib # Additional LDFLAGS to pass to the linker -ADDITIONAL_LDFLAGS += -lProjectCenter +#ADDITIONAL_LDFLAGS += # Additional library directories the linker should search -ADDITIONAL_LIB_DIRS += +ADDITIONAL_LIB_DIRS += -L../PCLib/$(GNUSTEP_OBJ_DIR) ADDITIONAL_TOOL_LIBS += +PCToolProj_BUNLDE_LIBS = -lProjectCenter + # # Flags dealing with installing and uninstalling # diff --git a/ProjectCenter/GNUmakefile.preamble b/ProjectCenter/GNUmakefile.preamble index b8c8324..64f97dd 100644 --- a/ProjectCenter/GNUmakefile.preamble +++ b/ProjectCenter/GNUmakefile.preamble @@ -49,13 +49,13 @@ ADDITIONAL_CFLAGS += #ADDITIONAL_CFLAGS += # Additional include directories the compiler should search -ADDITIONAL_INCLUDE_DIRS += +ADDITIONAL_INCLUDE_DIRS += -I../PCLib # Additional LDFLAGS to pass to the linker -ADDITIONAL_LDFLAGS += -lProjectCenter +#ADDITIONAL_LDFLAGS += # Additional library directories the linker should search -ADDITIONAL_LIB_DIRS += +ADDITIONAL_LIB_DIRS += -L../PCLib/$(GNUSTEP_OBJ_DIR) ADDITIONAL_TOOL_LIBS +=