* GNUmakefile: remove GDL2Palette from top level compilation.

* GDL2Palette/GNUmakefile: Fix compilation flags, include
gdl2.make
        relative not the installed version.
        * DBModeler/GNUmakefile: Ditto.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@21231 72102866-910b-0410-8b05-ffd578937521

DBModeler/GNUmakefile

@@ -1,5 +1,8 @@
 include $(GNUSTEP_MAKEFILES)/common.make
-include $(GNUSTEP_MAKEFILES)/Auxiliary/gdl2.make
+include ../gdl2.make
+
+SUBPROJECTS=../EOInterface ../EOModeler
+include $(GNUSTEP_MAKEFILES)/aggregate.make
 
 APP_NAME = DBModeler
 DBModeler_SUBPROJECTS=Inspectors
@@ -12,7 +15,7 @@ ADDITIONAL_LIB_DIRS+= -F../EOModeler
 ADDITIONAL_INCLUDE_DIRS+= -F../EOModeler
 else
 ADDITIONAL_INCLUDE_DIRS= -I..
-ADDITIONAL_LIB_DIRS= -L../EOModeler/$(GNUSTEP_OBJ_DIR)
+ADDITIONAL_LIB_DIRS+=-L../EOInterface/$(GNUSTEP_OBJ_DIR) -L../EOModeler/$(GNUSTEP_OBJ_DIR)
 endif
 
 ADDITIONAL_NATIVE_LIBS += EOInterface gnustep-db2modeler
@@ -33,5 +36,5 @@ $(APP_NAME)_OBJC_FILES =		\
 	ModelerAttributeEditor.m	\
 	EOAdditions.m			\
 	ModelerTableEmbedibleEditor.m	
-	
+
 include $(GNUSTEP_MAKEFILES)/application.make

GDL2Palette/GNUmakefile

@@ -1,26 +1,29 @@
 include $(GNUSTEP_MAKEFILES)/common.make
-include $(GNUSTEP_MAKEFILES)/Auxiliary/gdl2.make
+include ../gdl2.make
 
 PALETTE_NAME=GDL2
 GDL2_PRINCIPAL_CLASS = GDL2Palette
 
+SUBPROJECTS+=../EOModeler ../EOInterface
+include $(GNUSTEP_MAKEFILES)/aggregate.make
+
+ADDITIONAL_LIB_DIRS+=-L../EOAccess/$(GNUSTEP_OBJ_DIR) \
+	-L../EOControl/$(GNUSTEP_OBJ_DIR)
+# palette.make ignores the ADDTIONAL_LIBRARY_FILES, 
+# so we use ADDITIONAL_LDFLAGS.
 ifeq ($(FOUNDATION_LIB),apple)
-  ADDITIONAL_INCLUDE_DIRS += -F../EOModeler -F../EOInterface
-  ADDITIONAL_LIB_DIRS += -F../EOModeler -F../EOInterface
+  ADDITIONAL_INCLUDE_DIRS+=-F../EOModeler -F../EOInterface
+  ADDITIONAL_LIB_DIRS+=-F../EOModeler -F../EOInterface
+  ADDITIONAL_LDFLAGS+=-framework gnustep-db2modeler -framework EOInterface
 else
-  ADDITIONAL_INCLUDE_DIRS += -I../
-  ADDITIONAL_LIB_DIRS += -L../EOModeler -L../EOInterface
+  ADDITIONAL_INCLUDE_DIRS+=-I../
+  ADDITIONAL_LIB_DIRS+=-L../EOModeler/$(GNUSTEP_OBJ_DIR) \
+-L../EOInterface/$(GNUSTEP_OBJ_DIR)
+  ADDITIONAL_LDFLAGS+=-lgnustep-db2modeler -lEOInterface
 endif
 
-ADDITIONAL_NATIVE_LIBS+=EOModeler EOInterface
-LDFLAGS+=-framework gnustep-db2modeler -framework EOInterface
 
-
-ADDITIONAL_LIB_DIRS=			\
--L../EOAccess/$(GNUSTEP_OBJ_DIR)	\
--L../EOControl/$(GNUSTEP_OBJ_DIR)
-
-ADDITIONAL_LDFLAGS+=-lgnustep-db2control -lgnustep-db2
+ADDITIONAL_LDFLAGS+=$(AUXILIARY_TOOL_LIBS)
 
 GDL2_RESOURCE_FILES=GDL2Palette.tiff GDL2ConnectionInspector.gorm palette.table
 
@@ -31,4 +34,5 @@ GDL2_OBJC_FILES=		\
 	IB+Categories.m		\
 	Foundation+Categories.m
 
+
 include $(GNUSTEP_MAKEFILES)/palette.make

GNUmakefile

@@ -32,7 +32,7 @@ include ./Version
 SUBPROJECTS = EOControl EOAccess EOAdaptors Tools
 
 ifeq ($(GUI_MAKE_LOADED),yes)
-SUBPROJECTS += EOInterface EOModeler DBModeler GDL2Palette
+SUBPROJECTS += EOInterface EOModeler DBModeler
 endif
 
 DOCUMENT_NAME = GDL2