diff --git a/ChangeLog b/ChangeLog index 0ed2de9c8..aef5d1f0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,9 @@ * Source/libgnustep-gui.def: Remove NSMenuWindow. + * Model/GNUmakefile (libgmodel_BUNDLE_LIBS): New var. + (fix suggested by stephen@brandonitconsulting.co.uk). + 2001-09-28 Fred Kiefer * Header/gnustep/gui/NSCell.h diff --git a/Model/GNUmakefile b/Model/GNUmakefile index c8f5e8552..e19a2e163 100644 --- a/Model/GNUmakefile +++ b/Model/GNUmakefile @@ -77,13 +77,12 @@ ADDITIONAL_INCLUDE_DIRS = -I../Headers -I../Headers/gnustep # What are the libraries this library depends upon. This is needed for some # systems where building a shared library requires to pass to the linker # all the libraries the target library depends upon. - -#LIBRARIES_DEPEND_UPON = $(BACKEND_LIBS) $(GUI_LIBS) $(FND_LIBS) $(SYSTEM_LIBS) - ifneq ($(GUI_LIB), nx) libgmodel_LIBRARIES_DEPEND_UPON = -lgnustep-gui $(FND_LIBS) +libgmodel_BUNDLE_LIBS += $(libgmodel_LIBRARIES_DEPEND_UPON) else libgmodel_LIBRARIES_DEPEND_UPON = $(FND_LIBS) +libgmodel_BUNDLE_LIBS += $(libgmodel_LIBRARIES_DEPEND_UPON) endif nib2gmodel_LIBRARIES_DEPEND_UPON = $(BACKEND_LIBS) $(GUI_LIBS) \ $(FND_LIBS) $(SYSTEM_LIBS)