We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Use libtool everywhere

bug1431.patch (text/plain), 4.19 KB, created by john on 2013-04-17 14:23:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: john

Created: 2013-04-17 14:23:37 UTC

Size: 4.19 KB

patch

obsolete

>diff -r c1563f514b5b Makefile.in
>--- a/Makefile.in	Thu Apr 04 11:35:22 2013 -0400
>+++ b/Makefile.in	Wed Apr 17 14:17:09 2013 -0400
>@@ -33,10 +33,10 @@
> OBJECTS = @OBJECTS@
> VERSION_OBJECTS = @VERSION_OBJECTS@
> 
>-SDLMAIN_TARGET = libSDL2main.a
>+SDLMAIN_TARGET = libSDL2main.la
> SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@
> 
>-SDLTEST_TARGET = libSDL2_test.a
>+SDLTEST_TARGET = libSDL2_test.la
> SDLTEST_OBJECTS = @SDLTEST_OBJECTS@
> 
> SRC_DIST = acinclude Android.mk autogen.sh BUGS build-scripts configure configure.in COPYING CREDITS debian include INSTALL Makefile.minimal Makefile.in README* sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test TODO VisualC.html VisualC WhatsNew Xcode Xcode-iOS
>@@ -122,15 +122,13 @@
> .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
> 
> $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
>-	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
>+	$(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
> 
> $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
>-	$(AR) cru $@ $(SDLMAIN_OBJECTS)
>-	$(RANLIB) $@
>+	$(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
> 
> $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
>-	$(AR) cru $@ $(SDLTEST_OBJECTS)
>-	$(RANLIB) $@
>+	$(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
> 
> install: all install-bin install-hdrs install-lib install-data
> install-bin:
>@@ -151,10 +149,8 @@
> install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET)
> 	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)
> 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
>-	$(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
>-	$(RANLIB) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
>-	$(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
>-	$(RANLIB) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
>+	$(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
>+	$(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET)
> install-data:
> 	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal
> 	$(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4
>diff -r c1563f514b5b configure.in
>--- a/configure.in	Thu Apr 04 11:35:22 2013 -0400
>+++ b/configure.in	Wed Apr 17 14:17:09 2013 -0400
>@@ -2659,23 +2659,23 @@
> 
> VERSION_OBJECTS=`echo $VERSION_SOURCES`
> VERSION_DEPENDS=`echo $VERSION_SOURCES`
>-VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/$[[^ ]]*$\.rc,$(objects)/\1.o,g'`
>+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/$[[^ ]]*$\.rc,$(objects)/\1.lo,g'`
> VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\$[[^ ]]*\$/\$[[^ ]]*\$\\.rc,\\\\
>-\\$(objects)/\\2.o: \\1/\\2.rc\\\\
>+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\
> 	\\$(WINDRES) \\$< \\$@,g"`
> 
> SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
> SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
>-SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/$[[^ ]]*$\.c,$(objects)/\1.o,g'`
>+SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/$[[^ ]]*$\.c,$(objects)/\1.lo,g'`
> SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\$[[^ ]]*\$/\$[[^ ]]*\$\\.c,\\\\
>-\\$(objects)/\\2.o: \\1/\\2.c\\\\
>+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
> 	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
> 
> SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES`
> SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES`
>-SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/$[[^ ]]*$\.c,$(objects)/\1.o,g'`
>+SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/$[[^ ]]*$\.c,$(objects)/\1.lo,g'`
> SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\$[[^ ]]*\$/\$[[^ ]]*\$\\.c,\\\\
>-\\$(objects)/\\2.o: \\1/\\2.c\\\\
>+\\$(objects)/\\2.lo: \\1/\\2.c\\\\
> 	\\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"`
> 
> # Set runtime shared library paths as needed

Actions: View | Diff

Attachments on bug 1431: 829 | 1099 | 1114 | 1499

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.