| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071 |
- --- a/libopkg/Makefile.am
- +++ b/libopkg/Makefile.am
- @@ -38,16 +38,10 @@ if HAVE_SHA256
- opkg_util_sources += sha256.c sha256.h
- endif
-
- -lib_LTLIBRARIES = libopkg.la
- -libopkg_la_SOURCES = \
- +noinst_LIBRARIES = libopkg.a
- +libopkg_a_SOURCES = \
- $(opkg_libcore_sources) \
- $(opkg_cmd_sources) $(opkg_db_sources) \
- $(opkg_util_sources) $(opkg_list_sources)
-
- -libopkg_la_LIBADD = $(top_builddir)/libbb/libbb.la $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS)
- -
- -# make sure we only export symbols that are for public use
- -#libopkg_la_LDFLAGS = -export-symbols-regex "^opkg_.*"
- -
- -
- -
- +libopkg_a_LIBADD = $(top_builddir)/libbb/libbb.a
- --- a/libbb/Makefile.am
- +++ b/libbb/Makefile.am
- @@ -2,9 +2,9 @@ HOST_CPU=@host_cpu@
- BUILD_CPU=@build_cpu@
- ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"$(HOST_CPU)\" -DBUILD_CPU=@build_cpu@
-
- -noinst_LTLIBRARIES = libbb.la
- +noinst_LIBRARIES = libbb.a
-
- -libbb_la_SOURCES = gz_open.c \
- +libbb_a_SOURCES = gz_open.c \
- libbb.h \
- unzip.c \
- wfopen.c \
- --- a/tests/Makefile.am
- +++ b/tests/Makefile.am
- @@ -4,11 +4,11 @@ AM_CFLAGS = $(ALL_CFLAGS) -Wall -g -O3 -
- #noinst_PROGRAMS = libopkg_test opkg_active_list_test
- noinst_PROGRAMS = libopkg_test
-
- -#opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.la $(top_builddir)/libopkg/libopkg.la
- +#opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.a $(top_builddir)/libopkg/libopkg.a
- #opkg_hash_test_SOURCES = opkg_hash_test.c
- #opkg_hash_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
-
- -#opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.la $(top_builddir)/libopkg/libopkg.la
- +#opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.a $(top_builddir)/libopkg/libopkg.a
- #opkg_extract_test_SOURCES = opkg_extract_test.c
- #opkg_extract_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
-
- @@ -16,7 +16,7 @@ noinst_PROGRAMS = libopkg_test
- #opkg_active_list_test_SOURCES = opkg_active_list_test.c
- #opkg_active_list_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
-
- -libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.la
- +libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.a $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS)
- libopkg_test_SOURCE = libopkg_test.c
- libopkg_test_LDFLAGS = -static
-
- --- a/src/Makefile.am
- +++ b/src/Makefile.am
- @@ -2,5 +2,5 @@ AM_CFLAGS = -I${top_srcdir}/libopkg ${AL
- bin_PROGRAMS = opkg-cl
-
- opkg_cl_SOURCES = opkg-cl.c
- -opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.la \
- - $(top_builddir)/libbb/libbb.la
- +opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.a \
- + $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS)
|
