Index: Makefile.in ================================================================== --- Makefile.in +++ Makefile.in @@ -16,10 +16,11 @@ ARFLAGS = # @ARFLAGS@ AREXT = @AREXT@ PKGVERS = @PACKAGE_VERSION@ PKGVERSMAJOR = `echo $(PKGVERS) | cut -f 1 -d .` EXEEXT = @EXEEXT@ +LIBS = @LIBS@ prefix = @prefix@ mandir = @mandir@ sysconfdir = @sysconfdir@ datadir = @datadir@ @@ -27,20 +28,19 @@ bindir = @bindir@ libdir = @libdir@ includedir = @includedir@ srcdir = @srcdir@ -LIBS = libconfig.$(AREXT) libconfig.$(SHOBJEXT) -BINS = +BINS = libconfig.$(AREXT) libconfig.$(SHOBJEXT) # The following two lines need to be kept syncronised. OBJS = libconfig.o conf_space.o conf_section.o conf_apache.o conf_colon.o conf_equal.o conf_xml.o @LIBOBJS@ SHOBJS = libconfig_shr.o conf_space_shr.o conf_section_shr.o conf_apache_shr.o conf_colon_shr.o conf_equal_shr.o conf_xml_shr.o @SHLIBOBJS@ -all: $(LIBS) $(BINS) +all: $(BINS) libconfig.$(SHOBJEXT): $(SHOBJS) $(srcdir)/libconfig.vers libconfig.syms - $(CC) $(CPPFLAGS) $(CFLAGS) $(SHOBJFLAGS) $(SHOBJLDFLAGS) -o $@ $(SHOBJS) $(LDFLAGS) + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(SHOBJFLAGS) $(SHOBJLDFLAGS) -o $@ $(SHOBJS) $(LIBS) -@WEAKENSYMS@ libconfig.$(SHOBJEXT) -@REMOVESYMS@ libconfig.$(SHOBJEXT) libconfig.$(AREXT): $(OBJS) $(AR) rcu $@ $(OBJS) @@ -62,11 +62,11 @@ cat '$(srcdir)/libconfig.syms.in' | sed 's/^@''SYMPREFIX@//;s/^/ /;s/$$/;/' >> '$@' echo ' local:' >> '$@' echo ' *;' >> '$@' echo '};' >> '$@' -test-lc$(EXEEXT): $(LIBS) $(srcdir)/test-lc.c +test-lc$(EXEEXT): $(BINS) $(srcdir)/test-lc.c $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(filter %.c, $^) $(LDFLAGS) -Wl,-R -Wl,$(srcdir) -L$(srcdir) -lconfig install: all $(srcdir)/libconfig.h -$(INSTALL) -d "$(DESTDIR)$(mandir)" -$(INSTALL) -d "$(DESTDIR)$(mandir)/man3" @@ -89,14 +89,14 @@ $(INSTALL) -m 644 $(srcdir)/libconfig.h "$(DESTDIR)$(includedir)/libconfig.h" -( cd "$(DESTDIR)$(libdir)" && rm -f libconfig.$(SHOBJEXT).$(PKGVERSMAJOR) && $(LN_S) libconfig.$(SHOBJEXT).$(PKGVERS) libconfig.$(SHOBJEXT).$(PKGVERSMAJOR) ) -( cd "$(DESTDIR)$(libdir)" && rm -f libconfig.$(SHOBJEXT) && $(LN_S) libconfig.$(SHOBJEXT).$(PKGVERS) libconfig.$(SHOBJEXT) ) clean: - rm -f *.o $(BINS) $(LIBS) *~ test-lc$(EXEEXT) *.dll.a *.dll.def *.dll + rm -f *.o $(BINS) *~ test-lc$(EXEEXT) *.dll.a *.dll.def *.dll distclean: clean rm -f Makefile config.h config.status config.log lc_geterrno.3 lc_process.3 lc_cleanup.3 lc_process_file.3 lc_register_var.3 lc_geterrstr.3 lc_register_callback.3 libconfig.3 libconfig.syms mrproper: distclean rm -f aclocal.m4 config.guess config.sub install-sh configure .PHONY: all clean distclean install