diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2004-08-30 03:21:12 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2004-08-30 03:21:12 +0000 |
| commit | 2f70632d2923163bdfb13c13c75a2f094a2ad7a0 (patch) | |
| tree | c2562d18ca2b1cdb36169eace040925155328055 | |
| parent | ff0635c1815e50252f6dd53aa817bc1e4a955da7 (diff) | |
| download | gpsd-2f70632d2923163bdfb13c13c75a2f094a2ad7a0.tar.gz | |
Backed out the use of libtool, on the grounds that any tool which
creates invisible .libs subdirectories and makes my binaries depend
on them is evil.
| -rw-r--r-- | Makefile.am | 13 | ||||
| -rw-r--r-- | configure.in | 3 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index e24136c8..f6123e51 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ gps_SOURCES = \ version.h gps_CFLAGS = $(X_CFLAGS) -gps_LDADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(XM_LIBS) $(X_LIBS) $(X_PRE_LIBS) libgps.la +gps_LDADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(XM_LIBS) $(X_LIBS) $(X_PRE_LIBS) libgps.a # @@ -25,7 +25,7 @@ xgpsspeed_SOURCES = \ xgpsspeed.icon xgpsspeed_CFLAGS = $(X_CFLAGS) -xgpsspeed_LDADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(XAW_LIBS) $(XM_LIBS) $(X_LIBS) $(X_PRE_LIBS) libgps.la +xgpsspeed_LDADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) $(XAW_LIBS) $(XM_LIBS) $(X_LIBS) $(X_PRE_LIBS) libgps.a # @@ -37,15 +37,15 @@ gpsd_SOURCES = \ gpsd.c \ version.h -gpsd_LDADD = $(LIBM) libgps.la +gpsd_LDADD = $(LIBM) libgps.a # # Build shared libgps # -lib_LTLIBRARIES = libgps.la +lib_LIBRARIES = libgps.a -libgps_la_SOURCES = \ +libgps_a_SOURCES = \ netlib.c \ nmea_parse.c \ serial.c \ @@ -54,8 +54,7 @@ libgps_la_SOURCES = \ libgpsd_core.c \ libgps.c -libgps_la_LDFLAGS = -no-undefined -libgps_la_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) +libgps_a_LIBADD = $(LIBM) $(LIBC) $(LIBNSL) $(LIBSOCKET) # # Create Manpages diff --git a/configure.in b/configure.in index 08c82f9a..2cf1ae70 100644 --- a/configure.in +++ b/configure.in @@ -14,7 +14,8 @@ AC_LANG([C]) AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_INSTALL -AC_PROG_LIBTOOL +AC_PROG_RANLIB +#AC_PROG_LIBTOOL CFLAGS="$CFLAGS -Wall -Werror" |