summaryrefslogtreecommitdiff
path: root/Objective-C
diff options
context:
space:
mode:
authorMatthias Benkard <code@mail.matthias.benkard.de>2008-01-26 20:30:57 +0100
committerMatthias Benkard <code@mail.matthias.benkard.de>2008-01-26 20:30:57 +0100
commit5c858e7c596e326677b558f9a98b7957666c4359 (patch)
treeb100b6c645a30c4e74b350a917d7d4efbdb44788 /Objective-C
parent29cf411ae13383cf7481abd269dd54b2b137c466 (diff)
Minor makefile cleanups.
darcs-hash:4fe32e0e584134445304050cfca9ed2d028b5eb0
Diffstat (limited to 'Objective-C')
-rw-r--r--Objective-C/GNUmakefile8
1 files changed, 0 insertions, 8 deletions
diff --git a/Objective-C/GNUmakefile b/Objective-C/GNUmakefile
index 50ff9ab..48a1827 100644
--- a/Objective-C/GNUmakefile
+++ b/Objective-C/GNUmakefile
@@ -30,13 +30,6 @@ libobjcl_OBJC_FILES = libobjcl.m objc_support.m objc-runtime-apple.m objc-runtim
LIBRARIES_DEPEND_UPON = $(FND_LIBS) $(GUI_LIBS) $(OBJC_LIBS) $(SYSTEM_LIBS) $(CONFIG_SYSTEM_LIBS)
ifdef USE_LIBFFI
-#ifneq ($(COMMON_MAKE_LOADED),)
-## FIXME: The use of -rpath presupposes GNU ld.
-#ADDITIONAL_LDFLAGS = -Wl,-rpath $(CURDIR)/../libffi/.libs -L../libffi/.libs -lffi
-#else # Mac OS X
-#ADDITIONAL_LDFLAGS = -L$(CURDIR)/../libffi/.libs -lffi
-#endif
-
# FIXME: For now, we statically link against libffi. We are not certain
# that this is a good idea. Linking dynamically, on the other hand, is
# hard in general (that's one of the reasons libtool exists, after all).
@@ -68,7 +61,6 @@ obj/libobjcl.dylib: $(FFI_DEPS) obj/libobjcl.dylib.$(VERSION)
obj/libobjcl.dylib.$(VERSION): $(libobjcl_OBJ_FILES)
make -p obj
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)
-# sh ../libffi/libtool --mode=link -module -no-fast-install -avoid-version -version-info $(VERSION) -R $(CURDIR)/../libffi/.libs -L../libffi/.libs -lffi -o $@ $(libobjcl_OBJ_FILES)
obj/%.o: %.m
mkdir -p obj