9b15a0535d
- build with -pthread in LDFLAGS instead of -lpthread in LIBS; allegro-config passes LDFLAGS on, so dependent ports build correctly (WANTLIB changes in dependent ports coming soon) - don't build modules in liballegro: we don't ship an allegrorc to be able to choose which modules to use "sndio bits look ok" ratchov@
47 lines
2.8 KiB
Plaintext
47 lines
2.8 KiB
Plaintext
$OpenBSD: patch-makefile_in,v 1.2 2010/04/26 02:56:30 jakemsr Exp $
|
|
--- makefile.in.orig Wed Sep 19 06:19:25 2007
|
|
+++ makefile.in Tue Jan 12 02:03:00 2010
|
|
@@ -472,9 +472,9 @@ install-lib: lib modules
|
|
fi; \
|
|
done
|
|
@for l in alleg alld allp; do \
|
|
- if test -f $(LIBDIR)/lib$${l}-$(shared_version).so; then \
|
|
- echo Installing $(LIBDIR)/lib$${l}-$(shared_version).so to $(DESTDIR)$(libdir); \
|
|
- $(INSTALL_PROGRAM) $(LIBDIR)/lib$${l}-$(shared_version).so $(DESTDIR)$(libdir)/; \
|
|
+ if test -f $(LIBDIR)/lib$${l}.so.$(shared_major_minor); then \
|
|
+ echo Installing $(LIBDIR)/lib$${l}.so.$(shared_major_minor) to $(DESTDIR)$(libdir); \
|
|
+ $(INSTALL_PROGRAM) $(LIBDIR)/lib$${l}.so.$(shared_major_minor) $(DESTDIR)$(libdir)/; \
|
|
$(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \
|
|
fi; \
|
|
done
|
|
@@ -489,21 +489,6 @@ install-lib: lib modules
|
|
$(mkinstalldirs) $(DESTDIR)$(bindir)
|
|
@echo Installing allegro-config to $(DESTDIR)$(bindir)
|
|
@$(INSTALL_PROGRAM) allegro-config $(DESTDIR)$(bindir)
|
|
- @if test -n "$(LIBDIR)/liball*-$(shared_version).so"; then \
|
|
- (cat /etc/ld.so.conf | grep $(libdir) >/dev/null || \
|
|
- test $(libdir) = /lib || test $(libdir) = /usr/lib) \
|
|
- && ($(LDCONFIG) $(libdir) || true) || (\
|
|
- echo "" ; \
|
|
- echo "Warning: shared library destination $(libdir) is not in ldd search path." ; \
|
|
- echo "Unless you add it to /etc/ld.so.conf, you must set LD_LIBRARY_PATH to include"; \
|
|
- echo "$(libdir) each time you want to run an Allegro program." ; \
|
|
- ) ; \
|
|
- fi
|
|
- @for l in alleg alld allp; do \
|
|
- if test -f $(DESTDIR)$(libdir)/lib$${l}-$(shared_version).so -a \! -h $(DESTDIR)$(libdir)/lib$${l}.so.${shared_major_minor}; then \
|
|
- (cd $(DESTDIR)$(libdir); ln -s lib$${l}-$(shared_version).so lib$${l}.so.${shared_major_minor}); \
|
|
- fi; \
|
|
- done
|
|
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/aclocal
|
|
@echo Installing allegro.m4 to $(DESTDIR)$(prefix)/share/aclocal
|
|
@$(INSTALL_DATA) misc/allegro.m4 $(DESTDIR)$(prefix)/share/aclocal
|
|
@@ -687,6 +672,7 @@ depend:
|
|
$(SHELL) -c 'cd $(srcdir) && misc/depmod.sh esddigi "\`esd-config --libs\`" $(ALLEGRO_MODULE_ESD_FILES)' >>makefile.dep
|
|
$(SHELL) -c 'cd $(srcdir) && misc/depmod.sh artsdigi "\`artsc-config --libs\`" $(ALLEGRO_MODULE_ARTS_FILES)' >>makefile.dep
|
|
$(SHELL) -c 'cd $(srcdir) && misc/depmod.sh sgialdigi -laudio $(ALLEGRO_MODULE_SGIAL_FILES)' >>makefile.dep
|
|
+ $(SHELL) -c 'cd $(srcdir) && misc/depmod.sh sndiodigi -lsndio $(ALLEGRO_MODULE_SNDIO_FILES)' >>makefile.dep
|
|
$(SHELL) -c 'cd $(srcdir) && misc/depmod.sh jackdigi "\`pkg-config --libs jack\`" $(ALLEGRO_MODULE_JACK_FILES)' >>makefile.dep
|
|
@echo "Generating dependencies for simple programs"
|
|
$(SHELL) -c 'cd $(srcdir) && misc/deplexe.sh -- $(ALLEGRO_LIB_EXE_SOURCES) $(ALLEGRO_EXAMPLE_FILES)' >>makefile.dep
|