$OpenBSD: patch-makefile_in,v 1.3 2011/04/15 19:29:54 naddy Exp $ --- makefile.in.orig Wed Sep 19 15:19:25 2007 +++ makefile.in Fri Apr 15 01:18:25 2011 @@ -406,8 +406,6 @@ examples: $(EXAMPLE_FILES) # -------- rules for deleting the generated files -------- -clean: - define RM_OBJ_CLEAN_FILES $(foreach file, $(OBJ_CLEAN_FILES), rm -f $(file) ) @@ -418,25 +416,24 @@ clean: ) endef +clean: $(RM_OBJ_CLEAN_FILES) $(RM_OTHER_CLEAN_FILES) -distclean: clean - define RM_DISTCLEAN_FILES $(foreach file, $(DISTCLEAN_FILES) $(ALLEGRO_LIB_X_EXES), rm -f $(file) ) endef +distclean: clean $(RM_DISTCLEAN_FILES) -veryclean: distclean - define RM_VERYCLEAN_FILES $(foreach file, $(VERYCLEAN_FILES), rm -f $(file) ) endef +veryclean: distclean $(RM_VERYCLEAN_FILES) rm -f makefile @@ -472,9 +469,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 +486,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 +669,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