diff options
author | Matthias Benkard <code@mail.matthias.benkard.de> | 2008-01-28 19:17:00 +0100 |
---|---|---|
committer | Matthias Benkard <code@mail.matthias.benkard.de> | 2008-01-28 19:17:00 +0100 |
commit | 7cea2578637b823e93798e308ab0811c7fd7b7a4 (patch) | |
tree | 0db0eb3e9065528052ef618059ec7da91a44418a | |
parent | b44ee368288b98ed5125ccb214e6d665c134be1f (diff) |
Directory layout: Put code imported from PyObjC into its own directory.
darcs-hash:e3dd1138105e4eece0fbcbc13365eb3a25ffb808
-rw-r--r-- | COPYING.PyObjC | 2 | ||||
-rw-r--r-- | Objective-C/GNUmakefile | 7 | ||||
-rw-r--r-- | Objective-C/PyObjC/libffi_support.h (renamed from Objective-C/libffi_support.h) | 0 | ||||
-rw-r--r-- | Objective-C/PyObjC/libffi_support.m (renamed from Objective-C/libffi_support.m) | 0 | ||||
-rw-r--r-- | Objective-C/PyObjC/objc-runtime-apple.h (renamed from Objective-C/objc-runtime-apple.h) | 0 | ||||
-rw-r--r-- | Objective-C/PyObjC/objc-runtime-apple.m (renamed from Objective-C/objc-runtime-apple.m) | 0 | ||||
-rw-r--r-- | Objective-C/PyObjC/objc-runtime-gnu.h (renamed from Objective-C/objc-runtime-gnu.h) | 0 | ||||
-rw-r--r-- | Objective-C/PyObjC/objc-runtime-gnu.m (renamed from Objective-C/objc-runtime-gnu.m) | 0 | ||||
-rw-r--r-- | Objective-C/PyObjC/objc_support.h (renamed from Objective-C/objc_support.h) | 0 | ||||
-rw-r--r-- | Objective-C/PyObjC/objc_support.m (renamed from Objective-C/objc_support.m) | 0 | ||||
-rw-r--r-- | Objective-C/PyObjC/pyobjc.h (renamed from Objective-C/pyobjc.h) | 0 | ||||
-rw-r--r-- | Objective-C/libobjcl.m | 4 |
12 files changed, 7 insertions, 6 deletions
diff --git a/COPYING.PyObjC b/COPYING.PyObjC index 8332cd7..2ca9e23 100644 --- a/COPYING.PyObjC +++ b/COPYING.PyObjC @@ -1,5 +1,5 @@ The license expressed in this file applies to the following files in the -`Objective-C' directory: +`Objective-C/PyObjC' directory: * objc-runtime-apple.h * objc-runtime-apple.m diff --git a/Objective-C/GNUmakefile b/Objective-C/GNUmakefile index c69d1d7..7401667 100644 --- a/Objective-C/GNUmakefile +++ b/Objective-C/GNUmakefile @@ -33,7 +33,7 @@ LIBRARY_NAME = libobjcl RPM_DISABLE_RELOCATABLE = YES ADDITIONAL_OBJCFLAGS = -Wall -g -DVERSION=\"$(VERSION)\" -I/usr/local/include -libobjcl_OBJC_FILES = libobjcl.m objc_support.m objc-runtime-apple.m objc-runtime-gnu.m +libobjcl_OBJC_FILES = libobjcl.m PyObjC/objc_support.m PyObjC/objc-runtime-apple.m PyObjC/objc-runtime-gnu.m LIBRARIES_DEPEND_UPON = $(FND_LIBS) $(GUI_LIBS) $(OBJC_LIBS) $(SYSTEM_LIBS) $(CONFIG_SYSTEM_LIBS) ADDITIONAL_LDFLAGS = $(LIBS) @@ -49,13 +49,14 @@ ADDITIONAL_OBJCFLAGS += -I../libffi/include FFI_DEPS += ../libffi/.libs/libffi.a FFI_CLEAN += libffi_clean endif -libobjcl_OBJC_FILES += libffi_support.m +libobjcl_OBJC_FILES += PyObjC/libffi_support.m endif ifneq ($(COMMON_MAKE_LOADED),) -include $(GNUSTEP_MAKEFILES)/library.make before-all:: $(FFI_DEPS) + mkdir -p $(GNUSTEP_OBJ_DIR)/PyObjC after-clean:: $(FFI_CLEAN) @@ -77,7 +78,7 @@ obj/libobjcl.dylib.$(VERSION): $(libobjcl_OBJ_FILES) gcc -dynamiclib -current_version $(VERSION) -flat_namespace -undefined warning -install_name $(CURDIR)/obj/libobjcl.dylib.$(VERSION) -o $@ $(libobjcl_OBJ_FILES) -fnext-runtime -framework AppKit -framework Foundation -lm $(ADDITIONAL_LDFLAGS) $(ADDITIONAL_OBJCFLAGS) obj/%.o: %.m - mkdir -p obj + mkdir -p $(dir $@) gcc -o $@ -c $< -MMD -MP -DNeXT_Foundation_LIBRARY=1 -DNeXT_GUI_LIBRARY=1 -DNeXT_RUNTIME=1 -dynamic -fno-common -fno-omit-frame-pointer -Wno-import -fno-strict-aliasing -fnext-runtime -I. $(ADDITIONAL_OBJCFLAGS) endif diff --git a/Objective-C/libffi_support.h b/Objective-C/PyObjC/libffi_support.h index ca04c6b..ca04c6b 100644 --- a/Objective-C/libffi_support.h +++ b/Objective-C/PyObjC/libffi_support.h diff --git a/Objective-C/libffi_support.m b/Objective-C/PyObjC/libffi_support.m index 4bc1137..4bc1137 100644 --- a/Objective-C/libffi_support.m +++ b/Objective-C/PyObjC/libffi_support.m diff --git a/Objective-C/objc-runtime-apple.h b/Objective-C/PyObjC/objc-runtime-apple.h index 8d050a1..8d050a1 100644 --- a/Objective-C/objc-runtime-apple.h +++ b/Objective-C/PyObjC/objc-runtime-apple.h diff --git a/Objective-C/objc-runtime-apple.m b/Objective-C/PyObjC/objc-runtime-apple.m index b2888ac..b2888ac 100644 --- a/Objective-C/objc-runtime-apple.m +++ b/Objective-C/PyObjC/objc-runtime-apple.m diff --git a/Objective-C/objc-runtime-gnu.h b/Objective-C/PyObjC/objc-runtime-gnu.h index 5c87b6d..5c87b6d 100644 --- a/Objective-C/objc-runtime-gnu.h +++ b/Objective-C/PyObjC/objc-runtime-gnu.h diff --git a/Objective-C/objc-runtime-gnu.m b/Objective-C/PyObjC/objc-runtime-gnu.m index df868e4..df868e4 100644 --- a/Objective-C/objc-runtime-gnu.m +++ b/Objective-C/PyObjC/objc-runtime-gnu.m diff --git a/Objective-C/objc_support.h b/Objective-C/PyObjC/objc_support.h index a9b4b28..a9b4b28 100644 --- a/Objective-C/objc_support.h +++ b/Objective-C/PyObjC/objc_support.h diff --git a/Objective-C/objc_support.m b/Objective-C/PyObjC/objc_support.m index 862879c..862879c 100644 --- a/Objective-C/objc_support.m +++ b/Objective-C/PyObjC/objc_support.m diff --git a/Objective-C/pyobjc.h b/Objective-C/PyObjC/pyobjc.h index 6a2d6b4..6a2d6b4 100644 --- a/Objective-C/pyobjc.h +++ b/Objective-C/PyObjC/pyobjc.h diff --git a/Objective-C/libobjcl.m b/Objective-C/libobjcl.m index a1a0a39..58baf67 100644 --- a/Objective-C/libobjcl.m +++ b/Objective-C/libobjcl.m @@ -18,8 +18,8 @@ */ #import "libobjcl.h" -#import "libffi_support.h" -#import "objc_support.h" +#import "PyObjC/libffi_support.h" +#import "PyObjC/objc_support.h" #import <Foundation/Foundation.h> #include <stdarg.h> |