summaryrefslogtreecommitdiff
blob: e67463842ca3fa860a70e1c085b43eb9ebcd1992 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
diff -Naur gnustep-dl2-0.11.0.orig/DBModeler/GNUmakefile gnustep-dl2-0.11.0/DBModeler/GNUmakefile
--- gnustep-dl2-0.11.0.orig/DBModeler/GNUmakefile	2008-01-21 00:19:57.000000000 +0100
+++ gnustep-dl2-0.11.0/DBModeler/GNUmakefile	2008-01-21 00:20:04.000000000 +0100
@@ -30,7 +30,7 @@
 DBModeler_SUBPROJECTS=Inspectors
 
 ADDITIONAL_INCLUDE_DIRS+=-I../
-ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess ../EOControl ../EOInterface ../EOModeler
+override ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess ../EOControl ../EOInterface ../EOModeler
 ADDITIONAL_NATIVE_LIBS += EOAccess EOControl EOInterface EOModeler
 
 $(APP_NAME)_RESOURCE_FILES =			\
diff -Naur gnustep-dl2-0.11.0.orig/EOAccess/Makefile.preamble gnustep-dl2-0.11.0/EOAccess/Makefile.preamble
--- gnustep-dl2-0.11.0.orig/EOAccess/Makefile.preamble	2008-01-21 00:19:57.000000000 +0100
+++ gnustep-dl2-0.11.0/EOAccess/Makefile.preamble	2008-01-21 00:20:04.000000000 +0100
@@ -75,7 +75,7 @@
 
 ADDITIONAL_NATIVE_LIBS += EOControl
 
-ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl
+override ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl
 
 ifeq ($(FOUNDATION_HAS_KVC), yes)
         ADDITIONAL_OBJCFLAGS := $(ADDITIONAL_OBJCFLAGS) -DFOUNDATION_HAS_KVC=1
diff -Naur gnustep-dl2-0.11.0.orig/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile gnustep-dl2-0.11.0/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile
--- gnustep-dl2-0.11.0.orig/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile	2008-01-21 00:19:57.000000000 +0100
+++ gnustep-dl2-0.11.0/EOAdaptors/PostgreSQLAdaptor/LoginPanel/GNUmakefile	2008-01-21 00:20:04.000000000 +0100
@@ -40,7 +40,7 @@
 LoginPanel_INCLUDE_DIRS = -I.. -I../../..
 
 ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl
-ADDITIONAL_NATIVE_LIB_DIRS+=../../../EOControl ../../../EOAccess
+override ADDITIONAL_NATIVE_LIB_DIRS+=../../../EOControl ../../../EOAccess
 
 ifneq ($(FOUNDATION_LIB),gnu)
 LoginPanel_OBJC_LIBS += -lgnustep-baseadd
diff -Naur gnustep-dl2-0.11.0.orig/EOAdaptors/PostgreSQLAdaptor/Makefile.preamble gnustep-dl2-0.11.0/EOAdaptors/PostgreSQLAdaptor/Makefile.preamble
--- gnustep-dl2-0.11.0.orig/EOAdaptors/PostgreSQLAdaptor/Makefile.preamble	2008-01-21 00:19:57.000000000 +0100
+++ gnustep-dl2-0.11.0/EOAdaptors/PostgreSQLAdaptor/Makefile.preamble	2008-01-21 00:20:04.000000000 +0100
@@ -57,7 +57,7 @@
 
 # Libraries linked to the framework
 ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl
-ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl ../EOAccess
+override ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl ../EOAccess
 ifneq ($(FOUNDATION_LIB),gnu)
 LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
 endif
diff -Naur gnustep-dl2-0.11.0.orig/EOAdaptors/SQLiteAdaptor/GNUmakefile.in gnustep-dl2-0.11.0/EOAdaptors/SQLiteAdaptor/GNUmakefile.in
--- gnustep-dl2-0.11.0.orig/EOAdaptors/SQLiteAdaptor/GNUmakefile.in	2008-01-21 00:19:57.000000000 +0100
+++ gnustep-dl2-0.11.0/EOAdaptors/SQLiteAdaptor/GNUmakefile.in	2008-01-21 00:20:04.000000000 +0100
@@ -30,7 +30,7 @@
 LIBRARIES_DEPEND_UPON+=@SQLITE3_LIBS@
 FRAMEWORK_NAME=SQLite3EOAdaptor
 
-ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl ../EOAccess
+override ADDITIONAL_NATIVE_LIB_DIRS+=../EOControl ../EOAccess
 ADDITIONAL_NATIVE_LIBS+=EOControl EOAccess
 ADDITIONAL_INCLUDE_DIRS+=-I../../
 
diff -Naur gnustep-dl2-0.11.0.orig/EOAdaptors/SQLiteAdaptor/LoginPanel/GNUmakefile gnustep-dl2-0.11.0/EOAdaptors/SQLiteAdaptor/LoginPanel/GNUmakefile
--- gnustep-dl2-0.11.0.orig/EOAdaptors/SQLiteAdaptor/LoginPanel/GNUmakefile	2008-01-21 00:19:57.000000000 +0100
+++ gnustep-dl2-0.11.0/EOAdaptors/SQLiteAdaptor/LoginPanel/GNUmakefile	2008-01-21 00:20:04.000000000 +0100
@@ -37,7 +37,7 @@
 
 LoginPanel_INCLUDE_DIRS=-I.. -I../../../
 ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl
-ADDITIONAL_NATIVE_LIB_DIRS+=../../../EOControl ../../../EOAccess
+override ADDITIONAL_NATIVE_LIB_DIRS+=../../../EOControl ../../../EOAccess
 
 ifneq ($(FOUNDATION_LIB),gnu)
 LoginPanel_OBJC_LIBS+=-lgnustep-baseadd
diff -Naur gnustep-dl2-0.11.0.orig/EOInterface/Makefile.preamble gnustep-dl2-0.11.0/EOInterface/Makefile.preamble
--- gnustep-dl2-0.11.0.orig/EOInterface/Makefile.preamble	2008-01-21 00:19:57.000000000 +0100
+++ gnustep-dl2-0.11.0/EOInterface/Makefile.preamble	2008-01-21 00:20:04.000000000 +0100
@@ -64,6 +64,6 @@
 LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
 endif
 
-ADDITIONAL_NATIVE_LIB_DIRS += ../EOControl ../EOAccess
+override ADDITIONAL_NATIVE_LIB_DIRS += ../EOControl ../EOAccess
 
 ADDITIONAL_NATIVE_LIBS += EOControl EOAccess
diff -Naur gnustep-dl2-0.11.0.orig/EOModeler/Makefile.preamble gnustep-dl2-0.11.0/EOModeler/Makefile.preamble
--- gnustep-dl2-0.11.0.orig/EOModeler/Makefile.preamble	2008-01-21 00:19:57.000000000 +0100
+++ gnustep-dl2-0.11.0/EOModeler/Makefile.preamble	2008-01-21 00:20:04.000000000 +0100
@@ -72,6 +72,6 @@
 LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
 endif
 
-ADDITIONAL_NATIVE_LIB_DIRS += ../EOAccess ../EOControl
+override ADDITIONAL_NATIVE_LIB_DIRS += ../EOAccess ../EOControl
 
 ADDITIONAL_NATIVE_LIBS += EOControl EOAccess
diff -Naur gnustep-dl2-0.11.0.orig/GDL2Palette/GNUmakefile gnustep-dl2-0.11.0/GDL2Palette/GNUmakefile
--- gnustep-dl2-0.11.0.orig/GDL2Palette/GNUmakefile	2008-01-21 00:19:57.000000000 +0100
+++ gnustep-dl2-0.11.0/GDL2Palette/GNUmakefile	2008-01-21 00:20:04.000000000 +0100
@@ -31,7 +31,7 @@
 GDL2_PRINCIPAL_CLASS = GDL2Palette
 
 ADDITIONAL_INCLUDE_DIRS+=-I../
-ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess/ ../EOControl/ ../EOInterface ../EOModeler
+override ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess/ ../EOControl/ ../EOInterface ../EOModeler
 ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl EOInterface EOModeler 
 
 GDL2_RESOURCE_FILES=		\
diff -Naur gnustep-dl2-0.11.0.orig/GNUmakefile.in gnustep-dl2-0.11.0/GNUmakefile.in
--- gnustep-dl2-0.11.0.orig/GNUmakefile.in	2008-01-21 00:19:57.000000000 +0100
+++ gnustep-dl2-0.11.0/GNUmakefile.in	2008-01-21 00:21:51.000000000 +0100
@@ -36,7 +36,7 @@
 #
 # The list of subproject directories
 #
-SUBPROJECTS = EOControl EOAccess EOAdaptors Tools
+SUBPROJECTS = EOControl EOAccess EOAdaptors
 
 ifeq ($(GUI_MAKE_LOADED),yes)
 SUBPROJECTS += EOInterface EOModeler DBModeler  GDL2Palette