mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-30 00:40:20 +02:00
* Makefile.am: Call the library libqthreads.a, not libqt.a. The
old name conflicts with the Qt user interface toolkit. * Makefile.in: Regenerated.
This commit is contained in:
parent
c2cb25006b
commit
35bdeb9bba
2 changed files with 14 additions and 14 deletions
|
@ -6,10 +6,10 @@ AUTOMAKE_OPTIONS = foreign
|
||||||
SUBDIRS = md time
|
SUBDIRS = md time
|
||||||
|
|
||||||
lib_LIBRARIES = @target_libs@
|
lib_LIBRARIES = @target_libs@
|
||||||
EXTRA_LIBRARIES = libqt.a
|
EXTRA_LIBRARIES = libqthreads.a
|
||||||
|
|
||||||
libqt_a_SOURCES = qt.c copyright.h
|
libqthreads_a_SOURCES = qt.c copyright.h
|
||||||
libqt_a_LIBADD = qtmds.o qtmdc.o
|
libqthreads_a_LIBADD = qtmds.o qtmdc.o
|
||||||
|
|
||||||
qtmds.o: @qtmds_s@
|
qtmds.o: @qtmds_s@
|
||||||
$(COMPILE) -c @qtmds_s@
|
$(COMPILE) -c @qtmds_s@
|
||||||
|
|
|
@ -88,10 +88,10 @@ AUTOMAKE_OPTIONS = foreign
|
||||||
SUBDIRS = md time
|
SUBDIRS = md time
|
||||||
|
|
||||||
lib_LIBRARIES = @target_libs@
|
lib_LIBRARIES = @target_libs@
|
||||||
EXTRA_LIBRARIES = libqt.a
|
EXTRA_LIBRARIES = libqthreads.a
|
||||||
|
|
||||||
libqt_a_SOURCES = qt.c copyright.h
|
libqthreads_a_SOURCES = qt.c copyright.h
|
||||||
libqt_a_LIBADD = qtmds.o qtmdc.o
|
libqthreads_a_LIBADD = qtmds.o qtmdc.o
|
||||||
|
|
||||||
EXTRA_DIST = CHANGES README.MISC README.PORT b.h meas.c stp.c stp.h \
|
EXTRA_DIST = CHANGES README.MISC README.PORT b.h meas.c stp.c stp.h \
|
||||||
Makefile.base config
|
Makefile.base config
|
||||||
|
@ -105,8 +105,8 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../libguile
|
||||||
CPPFLAGS = @CPPFLAGS@
|
CPPFLAGS = @CPPFLAGS@
|
||||||
LDFLAGS = @LDFLAGS@
|
LDFLAGS = @LDFLAGS@
|
||||||
LIBS = @LIBS@
|
LIBS = @LIBS@
|
||||||
libqt_a_DEPENDENCIES = qtmds.o qtmdc.o
|
libqthreads_a_DEPENDENCIES = qtmds.o qtmdc.o
|
||||||
libqt_a_OBJECTS = qt.o
|
libqthreads_a_OBJECTS = qt.o
|
||||||
AR = ar
|
AR = ar
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
|
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
|
||||||
|
@ -120,8 +120,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||||
TAR = tar
|
TAR = tar
|
||||||
GZIP = --best
|
GZIP = --best
|
||||||
DEP_FILES = .deps/qt.P
|
DEP_FILES = .deps/qt.P
|
||||||
SOURCES = $(libqt_a_SOURCES)
|
SOURCES = $(libqthreads_a_SOURCES)
|
||||||
OBJECTS = $(libqt_a_OBJECTS)
|
OBJECTS = $(libqthreads_a_OBJECTS)
|
||||||
|
|
||||||
default: all
|
default: all
|
||||||
|
|
||||||
|
@ -195,10 +195,10 @@ distclean-libtool:
|
||||||
|
|
||||||
maintainer-clean-libtool:
|
maintainer-clean-libtool:
|
||||||
|
|
||||||
libqt.a: $(libqt_a_OBJECTS) $(libqt_a_DEPENDENCIES)
|
libqthreads.a: $(libqthreads_a_OBJECTS) $(libqthreads_a_DEPENDENCIES)
|
||||||
-rm -f libqt.a
|
-rm -f libqthreads.a
|
||||||
$(AR) cru libqt.a $(libqt_a_OBJECTS) $(libqt_a_LIBADD)
|
$(AR) cru libqthreads.a $(libqthreads_a_OBJECTS) $(libqthreads_a_LIBADD)
|
||||||
$(RANLIB) libqt.a
|
$(RANLIB) libqthreads.a
|
||||||
|
|
||||||
# This directory's subdirectories are mostly independent; you can cd
|
# This directory's subdirectories are mostly independent; you can cd
|
||||||
# into them and run `make' without going through this Makefile.
|
# into them and run `make' without going through this Makefile.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue