View previous topic :: View next topic |
Author |
Message |
Alan Knowles
Joined: 23 May 2006 Posts: 11
|
Posted: Tue May 23, 2006 1:39 am Post subject: Updated Makefile.DUIT |
|
|
Not sure if it's the offical way to build it, but these changes make it easier, and a little more portable.
===================================================================
--- Makefile.Duit (revision 152)
+++ Makefile.Duit (working copy)
@@ -3,7 +3,13 @@
# find leds at http://leds.sourceforge.net
#
+PHOBOS=/dmd/src/phobos/:/dmd/src/phobos
+PHOBOS_LIB=/dmd/lib
+DUIT=/usr/src/dui
+DMD=/dmd/bin/dmd
+DUIT_TARGET=/usr/src/dui
+
all: HelloWorld DuitTests duit
list:
@@ -16,28 +22,28 @@
##########################
### definitions for HelloWorld
##########################
-COMP_HelloWorld = dmd
-COMP_FLAGS_HelloWorld = -c -gc -od../obj/demos -op
-COMP_IMPORT_HelloWorld = -I/home/ruimt/dmd/src/phobos:/home/ruimt/devel/D1/Duit/trunk/test:/home/ruimt/devel/D1/Duit/trunk/src
-LINK_LIBS_HelloWorld=-L../.. -ldl -pthread -lstdc++ -lphobos -lduit -lphobos
+COMP_HelloWorld = $(DMD)
+COMP_FLAGS_HelloWorld = -c -gc -od$(DUIT_TARGET)/demos -op
+COMP_IMPORT_HelloWorld = -I$(PHOBOS):$(DUIT)/test:$(DUIT)/src
+LINK_LIBS_HelloWorld=-L$(DUIT_TARGET) -ldl -pthread -lstdc++ -lphobos -lduit -lphobos -L$(PHOBOS_LIB)
LINK_HelloWorld=gcc
##########################
### definitions for DuitTests
##########################
-COMP_DuitTests = dmd
-COMP_FLAGS_DuitTests = -c -gc -od../obj/demos -op
-COMP_IMPORT_DuitTests = -I/home/ruimt/dmd/src/phobos:/home/ruimt/devel/D1/Duit/trunk/test:/home/ruimt/devel/D1/Duit/trunk/src:/home/ruimt/devel/D1/Duit/trunk/demos
-LINK_LIBS_DuitTests=-L../.. -ldl -pthread -lstdc++ -lphobos -L/home/ruimt/devel/D1/Duit/ -lduit -lphobos
+COMP_DuitTests = $(DMD)
+COMP_FLAGS_DuitTests = -c -gc -od$(DUIT_TARGET)/demos -op
+COMP_IMPORT_DuitTests = -I$(PHOBOS):$(DUIT)/test:$(DUIT)/src:$(DUIT)/demos
+LINK_LIBS_DuitTests=-L$(DUIT_TARGET) -ldl -pthread -lstdc++ -lphobos -L$(DUIT) -lduit -lphobos -L$(PHOBOS_LIB)
LINK_DuitTests=gcc
##########################
### definitions for duit
##########################
-COMP_duit = dmd
-COMP_FLAGS_duit = -c -gc -profile -od../obj/src -op
-COMP_IMPORT_duit = -I/home/ruimt/dmd/src/phobos:/home/ruimt/devel/D1/Duit/trunk/src
-LINK_LIBS_duit=-L../.. -ldl -pthread -lstdc++ -lphobos
+COMP_duit = $(DMD)
+COMP_FLAGS_duit = -c -gc -profile -od$(DUIT_TARGET)/src -op
+COMP_IMPORT_duit = -I$(PHOBOS):$(DUIT)/src
+LINK_LIBS_duit=-L$(DUIT_TARGET) -ldl -pthread -lstdc++ -lphobos -L$(PHOBOS_LIB)
LINK_duit=ar rcs
##########################################
@@ -59,11 +65,11 @@
HelloWorld_LINK:
cd \
- obj/demos; \
+ $(DUIT_TARGET)/demos; \
\$(LINK_HelloWorld) \
- /home/ruimt/devel/D1/Duit/trunk/obj/demos/gtk/HelloWorld.o \
+ $(DUIT)/demos/gtk/HelloWorld.o \
-o \
- /home/ruimt/devel/D1/Duit/trunk/HelloWorld \
+ $(DUIT)/HelloWorld \
$(LINK_LIBS_HelloWorld)
@@ -94,7 +100,7 @@
DuitTests_LINK:
cd \
- obj/demos; \
+ $(DUIT_TARGET)/demos; \
\$(LINK_DuitTests) \
duit/TEditableCells.o \
duit/TTextView.o \
@@ -110,7 +116,7 @@
duit/TestTreeView1.o \
duit/TestWindow.o \
-o \
- /home/ruimt/devel/D1/Duit/trunk/DuitTests \
+ $(DUIT)/DuitTests \
$(LINK_LIBS_DuitTests)
@@ -476,9 +482,9 @@
duit_LINK:
cd \
- obj/src; \
+ $(DUIT_TARGET)/src; \
$(LINK_duit) \
- ../../libduit.a \
+ $(DUIT_TARGET)/libduit.a \
atk/Action.o \
atk/Component.o \
atk/Document.o \
@@ -645,7 +651,6 @@
gtk/ButtonBox.o \
gtk/Calendar.o \
gtk/CellEditable.o \
- gtk/CellLayout.o \
gtk/CellLayoutIF.o \
gtk/CellLayoutT.o \
gtk/CellRenderer.o \
@@ -834,7 +839,7 @@
clean: cleanHelloWorld cleanDuitTests cleanduit
cleanHelloWorld:
- rm /home/ruimt/devel/D1/Duit/trunk/obj/demos/gtk/HelloWorld.o
+ rm $(DUIT)/obj/demos/gtk/HelloWorld.o
cleanDuitTests:
rm duit/TEditableCells.o
@@ -1018,7 +1023,6 @@
rm gtk/ButtonBox.o
rm gtk/Calendar.o
rm gtk/CellEditable.o
- rm gtk/CellLayout.o
rm gtk/CellLayoutIF.o
rm gtk/CellLayoutT.o
rm gtk/CellRenderer.o
raqlinux:/usr/src/dui# |
|
Back to top |
|
|
Ant
Joined: 06 Mar 2004 Posts: 306 Location: Canada
|
Posted: Tue May 23, 2006 7:04 pm Post subject: Re: Updated Makefile.DUIT |
|
|
Alan Knowles wrote: | Not sure if it's the offical way to build it, but these changes make it easier, and a little more portable. |
thank you.
The makefile is generated automatically by leds.
I'll try to incorporate these changes into the routine
But today I'll try to see what's up with multithreads and Duit...
Ant |
|
Back to top |
|
|
|
|
You cannot post new topics in this forum You cannot reply to topics in this forum You cannot edit your posts in this forum You cannot delete your posts in this forum You cannot vote in polls in this forum
|
Powered by phpBB © 2001, 2005 phpBB Group
|