1
Build the PIC and non-PIC object files in different directories.
2
Build the shared and static libraries in these directories.
5
Ludovic Brenta, 2008-07-22.
7
Index: libgtkada2-2.12.0/src/opengl/Makefile.in
8
===================================================================
9
--- libgtkada2-2.12.0.orig/src/opengl/Makefile.in
10
+++ libgtkada2-2.12.0/src/opengl/Makefile.in
13
module_ada: ${OPENGL_C_OBJECTS_DIR}
15
-${OBJ_DIR}/gtkglarea.o: gtkglarea.h gtkglarea.c
16
+${OBJ_DIR}/gtkglarea.o: gtkglarea.h gtkglarea.c | ${OBJ_DIR}
17
$(CC) -c $(CFLAGS) -o$@ $(OPENGL_FLAGS) gtkglarea.c
19
-${OBJ_DIR}/gdkgl.o: gdkgl.h gdkgl.c
20
+${OBJ_DIR}/gdkgl.o: gdkgl.h gdkgl.c | ${OBJ_DIR}
21
$(CC) -c $(CFLAGS) -o$@ $(OPENGL_FLAGS) gdkgl.c
27
distclean: module_distclean
28
Index: libgtkada2-2.12.0/src/gtkada_src.gpr
29
===================================================================
30
--- libgtkada2-2.12.0.orig/src/gtkada_src.gpr
31
+++ libgtkada2-2.12.0/src/gtkada_src.gpr
34
-with "gtkextra/gtkextra";
37
- for Languages use ("C", "Ada");
38
for Source_Dirs use (".");
39
- for Object_Dir use "lib-obj";
40
+ for Object_Dir use External ("OBJ_DIR", "lib-obj");
42
package Compiler renames Shared.Compiler;
43
package Binder renames Shared.Binder;
44
Index: libgtkada2-2.12.0/src/glade/glade.gpr
45
===================================================================
46
--- libgtkada2-2.12.0.orig/src/glade/glade.gpr
47
+++ libgtkada2-2.12.0/src/glade/glade.gpr
52
- for Object_Dir use "obj";
53
+ for Object_Dir use External ("OBJ_DIR", "lib-obj");
55
case Shared.Build_Glade is
56
when "True" => for Source_Dirs use (".");
57
Index: libgtkada2-2.12.0/src/opengl/opengl.gpr
58
===================================================================
59
--- libgtkada2-2.12.0.orig/src/opengl/opengl.gpr
60
+++ libgtkada2-2.12.0/src/opengl/opengl.gpr
65
- for Object_Dir use "obj";
66
+ for Object_Dir use External ("OBJ_DIR", "lib-obj");
68
case Shared.Build_Opengl is
69
when "True" => for Source_Dirs use (".");
70
Index: libgtkada2-2.12.0/src/gnome/gnome.gpr
71
===================================================================
72
--- libgtkada2-2.12.0.orig/src/gnome/gnome.gpr
73
+++ libgtkada2-2.12.0/src/gnome/gnome.gpr
78
- for Object_Dir use "obj";
79
+ for Object_Dir use External ("OBJ_DIR", "lib-obj");
81
case Shared.Build_Gnome is
82
when "True" => for Source_Dirs use (".");
83
Index: libgtkada2-2.12.0/src/tools/Makefile.in
84
===================================================================
85
--- libgtkada2-2.12.0.orig/src/tools/Makefile.in
86
+++ libgtkada2-2.12.0/src/tools/Makefile.in
89
GTKADA_CONFIG = gtkada-config
91
-GNATMAKELDFLAGS = -largs -L../lib-obj -lgtkada$(MAJOR) $(GTK_LIBS)
92
+GNATMAKELDFLAGS = -largs -L../$(OBJ_DIR) -lgtkada$(MAJOR) $(GTK_LIBS)
95
include ../Makefile.common
96
Index: libgtkada2-2.12.0/src/tools/tools.gpr
97
===================================================================
98
--- libgtkada2-2.12.0.orig/src/tools/tools.gpr
99
+++ libgtkada2-2.12.0/src/tools/tools.gpr
103
for Main use ("gdialog.adb", "gate.adb");
104
- for Object_Dir use "obj";
105
+ for Object_Dir use External ("OBJ_DIR", "lib-obj");
108
for Default_Switches ("Ada") use Shared.Builder'Default_Switches ("Ada");