Permalink
Browse files

Merge branch 'master' of git://github.com/jtauber/cleese

  • Loading branch information...
2 parents 78c243b + 3e3ad3c commit 657dd87efb30e02866657a89687bce9054549b50 @brosner committed Oct 11, 2009
Showing with 19 additions and 19 deletions.
  1. +19 −19 oneplusone/Makefile
  2. 0 oneplusone/{ → python}/Include/Python.h
  3. 0 oneplusone/{ → python}/Include/compile.h
  4. 0 oneplusone/{ → python}/Include/dictobject.h
  5. 0 oneplusone/{ → python}/Include/eval.h
  6. 0 oneplusone/{ → python}/Include/frameobject.h
  7. 0 oneplusone/{ → python}/Include/import.h
  8. 0 oneplusone/{ → python}/Include/intobject.h
  9. 0 oneplusone/{ → python}/Include/marshal.h
  10. 0 oneplusone/{ → python}/Include/moduleobject.h
  11. 0 oneplusone/{ → python}/Include/object.h
  12. 0 oneplusone/{ → python}/Include/objimpl.h
  13. 0 oneplusone/{ → python}/Include/opcode.h
  14. 0 oneplusone/{ → python}/Include/pymem.h
  15. 0 oneplusone/{ → python}/Include/pystate.h
  16. 0 oneplusone/{ → python}/Include/pythonrun.h
  17. 0 oneplusone/{ → python}/Include/stringobject.h
  18. 0 oneplusone/{ → python}/Include/tupleobject.h
  19. 0 oneplusone/{ → python}/Modules/M___main__.c
  20. 0 oneplusone/{ → python}/Modules/gcmodule.c
  21. 0 oneplusone/{ → python}/Modules/main.c
  22. 0 oneplusone/{ → python}/Modules/python.c
  23. 0 oneplusone/{ → python}/Objects/dictobject.c
  24. 0 oneplusone/{ → python}/Objects/frameobject.c
  25. 0 oneplusone/{ → python}/Objects/intobject.c
  26. 0 oneplusone/{ → python}/Objects/moduleobject.c
  27. 0 oneplusone/{ → python}/Objects/object.c
  28. 0 oneplusone/{ → python}/Objects/stringobject.c
  29. 0 oneplusone/{ → python}/Objects/tupleobject.c
  30. 0 oneplusone/{ → python}/Objects/typeobject.c
  31. 0 oneplusone/{ → python}/Python/ceval.c
  32. 0 oneplusone/{ → python}/Python/compile.c
  33. 0 oneplusone/{ → python}/Python/import.c
  34. 0 oneplusone/{ → python}/Python/marshal.c
  35. 0 oneplusone/{ → python}/Python/pystate.c
  36. 0 oneplusone/{ → python}/Python/pythonrun.c
View
38 oneplusone/Makefile
@@ -1,27 +1,27 @@
-INCLUDE_FLAGS = -I./Include
+INCLUDE_FLAGS = -I./python/Include
OBJECT_OBJS = \
- Objects/frameobject.o \
- Objects/intobject.o \
- Objects/dictobject.o \
- Objects/stringobject.o \
- Objects/typeobject.o \
- Objects/object.o \
- Objects/tupleobject.o \
- Objects/moduleobject.o
+ python/Objects/frameobject.o \
+ python/Objects/intobject.o \
+ python/Objects/dictobject.o \
+ python/Objects/stringobject.o \
+ python/Objects/typeobject.o \
+ python/Objects/object.o \
+ python/Objects/tupleobject.o \
+ python/Objects/moduleobject.o
PYTHON_OBJS = \
- Python/pythonrun.o \
- Python/pystate.o \
- Python/import.o \
- Python/marshal.o \
- Python/ceval.o \
- Python/compile.o
+ python/Python/pythonrun.o \
+ python/Python/pystate.o \
+ python/Python/import.o \
+ python/Python/marshal.o \
+ python/Python/ceval.o \
+ python/Python/compile.o
MODULE_OBJS = \
- Modules/main.o \
- Modules/M___main__.o \
- Modules/gcmodule.o
+ python/Modules/main.o \
+ python/Modules/M___main__.o \
+ python/Modules/gcmodule.o
LIB_OBJS = \
lib/string.o \
@@ -34,7 +34,7 @@ MACH_OBJS = \
OBJS = \
kstart.o \
- Modules/python.o \
+ python/Modules/python.o \
$(OBJECT_OBJS) \
$(PYTHON_OBJS) \
$(MODULE_OBJS) \
View
0 oneplusone/Include/Python.h → oneplusone/python/Include/Python.h
File renamed without changes.
View
0 oneplusone/Include/compile.h → oneplusone/python/Include/compile.h
File renamed without changes.
View
0 oneplusone/Include/dictobject.h → oneplusone/python/Include/dictobject.h
File renamed without changes.
View
0 oneplusone/Include/eval.h → oneplusone/python/Include/eval.h
File renamed without changes.
View
0 oneplusone/Include/frameobject.h → oneplusone/python/Include/frameobject.h
File renamed without changes.
View
0 oneplusone/Include/import.h → oneplusone/python/Include/import.h
File renamed without changes.
View
0 oneplusone/Include/intobject.h → oneplusone/python/Include/intobject.h
File renamed without changes.
View
0 oneplusone/Include/marshal.h → oneplusone/python/Include/marshal.h
File renamed without changes.
View
0 oneplusone/Include/moduleobject.h → oneplusone/python/Include/moduleobject.h
File renamed without changes.
View
0 oneplusone/Include/object.h → oneplusone/python/Include/object.h
File renamed without changes.
View
0 oneplusone/Include/objimpl.h → oneplusone/python/Include/objimpl.h
File renamed without changes.
View
0 oneplusone/Include/opcode.h → oneplusone/python/Include/opcode.h
File renamed without changes.
View
0 oneplusone/Include/pymem.h → oneplusone/python/Include/pymem.h
File renamed without changes.
View
0 oneplusone/Include/pystate.h → oneplusone/python/Include/pystate.h
File renamed without changes.
View
0 oneplusone/Include/pythonrun.h → oneplusone/python/Include/pythonrun.h
File renamed without changes.
View
0 oneplusone/Include/stringobject.h → oneplusone/python/Include/stringobject.h
File renamed without changes.
View
0 oneplusone/Include/tupleobject.h → oneplusone/python/Include/tupleobject.h
File renamed without changes.
View
0 oneplusone/Modules/M___main__.c → oneplusone/python/Modules/M___main__.c
File renamed without changes.
View
0 oneplusone/Modules/gcmodule.c → oneplusone/python/Modules/gcmodule.c
File renamed without changes.
View
0 oneplusone/Modules/main.c → oneplusone/python/Modules/main.c
File renamed without changes.
View
0 oneplusone/Modules/python.c → oneplusone/python/Modules/python.c
File renamed without changes.
View
0 oneplusone/Objects/dictobject.c → oneplusone/python/Objects/dictobject.c
File renamed without changes.
View
0 oneplusone/Objects/frameobject.c → oneplusone/python/Objects/frameobject.c
File renamed without changes.
View
0 oneplusone/Objects/intobject.c → oneplusone/python/Objects/intobject.c
File renamed without changes.
View
0 oneplusone/Objects/moduleobject.c → oneplusone/python/Objects/moduleobject.c
File renamed without changes.
View
0 oneplusone/Objects/object.c → oneplusone/python/Objects/object.c
File renamed without changes.
View
0 oneplusone/Objects/stringobject.c → oneplusone/python/Objects/stringobject.c
File renamed without changes.
View
0 oneplusone/Objects/tupleobject.c → oneplusone/python/Objects/tupleobject.c
File renamed without changes.
View
0 oneplusone/Objects/typeobject.c → oneplusone/python/Objects/typeobject.c
File renamed without changes.
View
0 oneplusone/Python/ceval.c → oneplusone/python/Python/ceval.c
File renamed without changes.
View
0 oneplusone/Python/compile.c → oneplusone/python/Python/compile.c
File renamed without changes.
View
0 oneplusone/Python/import.c → oneplusone/python/Python/import.c
File renamed without changes.
View
0 oneplusone/Python/marshal.c → oneplusone/python/Python/marshal.c
File renamed without changes.
View
0 oneplusone/Python/pystate.c → oneplusone/python/Python/pystate.c
File renamed without changes.
View
0 oneplusone/Python/pythonrun.c → oneplusone/python/Python/pythonrun.c
File renamed without changes.

0 comments on commit 657dd87

Please sign in to comment.