projects
/
h316.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fa105a9
)
*** empty log message ***
author
hachti
<hachti>
Thu, 14 Dec 2006 05:59:46 +0000
(
05:59
+0000)
committer
hachti
<hachti>
Thu, 14 Dec 2006 05:59:46 +0000
(
05:59
+0000)
Makefile
patch
|
blob
|
blame
|
history
diff --git
a/Makefile
b/Makefile
index f9a129abbc3a34c6c2284d3b5e9e69156cfa63cc..d723946c558fa93000868e5211f2c84ccd07681f 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,6
+1,5
@@
# Toplevel Makefile for Hachti's H316 stuff collection
# Toplevel Makefile for Hachti's H316 stuff collection
-<<<<<<< Makefile
# First we need the PC side tools. Nothing runs without them!
SUBDIRS=pc-tools/ldc pc-tools/src-filters pc-tools/boot-maker
# First we need the PC side tools. Nothing runs without them!
SUBDIRS=pc-tools/ldc pc-tools/src-filters pc-tools/boot-maker
@@
-25,12
+24,6
@@
SUBDIRS+=programs/mandelbrot\
programs/punchomat\
programs/punchomat\
-=======
-SUBDIRS=pc-tools/ldc pc-tools/src-filters pc-tools/boot-maker lib/iolib lib/fortran \
- lib/fortran lib/iolib programs/mandelbrot\
- programs/punchomat programs/tools systems
->>>>>>> 1.12
-
#lib/fortran/vpunch-help
# If you want to build the docs, too: Uncomment next line:
#lib/fortran/vpunch-help
# If you want to build the docs, too: Uncomment next line: