Check-in [5ede65f296]
Overview
Comment:Updated to correctly link to libopennet
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 5ede65f296ee0d4b44b51b7e764daaee4837a0f1
User & Date: rkeene on 2014-11-24 19:43:03
Other Links: manifest | tags
Context
2014-11-24
19:55
Updated to search for gethostbyname check-in: dcd817161e user: rkeene tags: trunk
19:43
Updated to correctly link to libopennet check-in: 5ede65f296 user: rkeene tags: trunk
19:32
libconfig 0.3.1 check-in: 56e030b473 user: rkeene tags: trunk, 0.3.1
Changes

Modified Makefile.in from [b1254947ba] to [eb94a13f4a].

    14     14   SHOBJLDFLAGS = @SHOBJLDFLAGS@
    15     15   SHOBJEXT = @SHOBJEXT@
    16     16   ARFLAGS = # @ARFLAGS@
    17     17   AREXT = @AREXT@
    18     18   PKGVERS = @PACKAGE_VERSION@
    19     19   PKGVERSMAJOR = `echo $(PKGVERS) | cut -f 1 -d .`
    20     20   EXEEXT = @EXEEXT@
           21  +LIBS = @LIBS@
    21     22   
    22     23   prefix = @prefix@
    23     24   mandir = @mandir@
    24     25   sysconfdir = @sysconfdir@
    25     26   datadir = @datadir@
    26     27   exec_prefix = @exec_prefix@
    27     28   bindir = @bindir@
    28     29   libdir = @libdir@
    29     30   includedir = @includedir@
    30     31   srcdir = @srcdir@
    31     32   
    32         -LIBS = libconfig.$(AREXT) libconfig.$(SHOBJEXT)
    33         -BINS =
           33  +BINS = libconfig.$(AREXT) libconfig.$(SHOBJEXT)
    34     34   # The following two lines need to be kept syncronised.
    35     35   OBJS = libconfig.o conf_space.o conf_section.o conf_apache.o conf_colon.o conf_equal.o conf_xml.o @LIBOBJS@
    36     36   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@
    37     37   
    38         -all: $(LIBS) $(BINS)
           38  +all: $(BINS)
    39     39   
    40     40   libconfig.$(SHOBJEXT): $(SHOBJS) $(srcdir)/libconfig.vers libconfig.syms
    41         -	$(CC) $(CPPFLAGS) $(CFLAGS) $(SHOBJFLAGS) $(SHOBJLDFLAGS) -o $@ $(SHOBJS) $(LDFLAGS)
           41  +	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(SHOBJFLAGS) $(SHOBJLDFLAGS) -o $@ $(SHOBJS) $(LIBS)
    42     42   	-@WEAKENSYMS@ libconfig.$(SHOBJEXT)
    43     43   	-@REMOVESYMS@ libconfig.$(SHOBJEXT)
    44     44   
    45     45   libconfig.$(AREXT): $(OBJS)
    46     46   	$(AR) rcu $@ $(OBJS)
    47     47   	-$(RANLIB) $@
    48     48   
................................................................................
    60     60   	echo 'LIBCONFIG_0.3.0 {' > '$@'
    61     61   	echo '	global:' >> '$@'
    62     62   	cat '$(srcdir)/libconfig.syms.in' | sed 's/^@''SYMPREFIX@//;s/^/		/;s/$$/;/' >> '$@'
    63     63   	echo '	local:' >> '$@'
    64     64   	echo '		*;' >> '$@'
    65     65   	echo '};' >> '$@'
    66     66   
    67         -test-lc$(EXEEXT): $(LIBS) $(srcdir)/test-lc.c
           67  +test-lc$(EXEEXT): $(BINS) $(srcdir)/test-lc.c
    68     68   	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(filter %.c, $^) $(LDFLAGS) -Wl,-R -Wl,$(srcdir) -L$(srcdir) -lconfig
    69     69   
    70     70   install: all $(srcdir)/libconfig.h
    71     71   	-$(INSTALL) -d "$(DESTDIR)$(mandir)"
    72     72   	-$(INSTALL) -d "$(DESTDIR)$(mandir)/man3"
    73     73   	-$(INSTALL) -d "$(DESTDIR)$(libdir)"
    74     74   	-$(INSTALL) -d "$(DESTDIR)$(includedir)"
................................................................................
    87     87   	$(INSTALL) -m 644 lc_cleanup.3 "$(DESTDIR)$(mandir)/man3/lc_cleanup.3"
    88     88   	$(INSTALL) -m 644 libconfig.3 "$(DESTDIR)$(mandir)/man3/libconfig.3"
    89     89   	$(INSTALL) -m 644 $(srcdir)/libconfig.h "$(DESTDIR)$(includedir)/libconfig.h"
    90     90   	-( cd "$(DESTDIR)$(libdir)" && rm -f libconfig.$(SHOBJEXT).$(PKGVERSMAJOR) && $(LN_S) libconfig.$(SHOBJEXT).$(PKGVERS) libconfig.$(SHOBJEXT).$(PKGVERSMAJOR) )
    91     91   	-( cd "$(DESTDIR)$(libdir)" && rm -f libconfig.$(SHOBJEXT) && $(LN_S) libconfig.$(SHOBJEXT).$(PKGVERS) libconfig.$(SHOBJEXT) )
    92     92   
    93     93   clean:
    94         -	rm -f *.o $(BINS) $(LIBS) *~ test-lc$(EXEEXT) *.dll.a *.dll.def *.dll
           94  +	rm -f *.o $(BINS) *~ test-lc$(EXEEXT) *.dll.a *.dll.def *.dll
    95     95   
    96     96   distclean: clean
    97     97   	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
    98     98   
    99     99   mrproper: distclean
   100    100   	rm -f aclocal.m4 config.guess config.sub install-sh configure
   101    101   
   102    102   .PHONY: all clean distclean install