Check-in [aa484e24b4]
Overview
Comment:libconfig 0.2.6 Fixed support for building in a directory other than the one with the source code
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | 0.2.6
Files: files | file ages | folders
SHA1: aa484e24b4cf3bf1d86cdd57904fc720eeeb13f2
User & Date: rkeene on 2011-09-05 14:10:17
Other Links: manifest | tags
Context
2011-09-05
14:36
Removed generated files from version control check-in: 0d42a059cd user: rkeene tags: trunk
14:10
libconfig 0.2.6 Fixed support for building in a directory other than the one with the source code check-in: aa484e24b4 user: rkeene tags: trunk, 0.2.6
13:44
Fixed compiler warning check-in: 2a5fa5bf86 user: rkeene tags: trunk
Changes

Modified Makefile.in from [cb7ca24603] to [65d0a00b06].

     1      1   CC = @CC@
     2      2   LN_S = @LN_S@
     3      3   AR = @AR@
     4      4   RANLIB = @RANLIB@
     5      5   CPP = @CPP@
     6         -CFLAGS = -Wall @CFLAGS@ @DEFS@
            6  +CFLAGS = @CFLAGS@ @DEFS@
     7      7   CPPFLAGS = @CPPFLAGS@ @DEFS@
     8         -LDFLAGS = @LDFLAGS@ @LIBS@
            8  +LDFLAGS = @LDFLAGS@
     9      9   INSTALL = @INSTALL@
    10     10   EXEEXT = @EXEEXT@
    11     11   OBJEXT = @OBJEXT@
    12     12   PATH_SEPARATOR = @PATH_SEPARATOR@
    13     13   SHOBJFLAGS = @SHOBJFLAGS@
    14     14   SHOBJLDFLAGS = @SHOBJLDFLAGS@
    15     15   SHOBJEXT = @SHOBJEXT@
................................................................................
    23     23   mandir = @mandir@
    24     24   sysconfdir = @sysconfdir@
    25     25   datadir = @datadir@
    26     26   exec_prefix = @exec_prefix@
    27     27   bindir = @bindir@
    28     28   libdir = @libdir@
    29     29   includedir = @includedir@
           30  +srcdir = @srcdir@
    30     31   
    31     32   LIBS = libconfig.$(AREXT) libconfig.$(SHOBJEXT)
    32     33   BINS =
    33     34   # The following two lines need to be kept syncronised.
    34     35   OBJS = libconfig.o conf_space.o conf_section.o conf_apache.o conf_colon.o conf_equal.o conf_xml.o @LIBOBJS@
    35     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@
    36     37   
................................................................................
    38     39   libconfig.$(SHOBJEXT): $(SHOBJS)
    39     40   	$(CC) $(CPPFLAGS) $(CFLAGS) $(SHOBJFLAGS) $(SHOBJLDFLAGS) -o $@ $^ $(LDFLAGS)
    40     41   
    41     42   libconfig.$(AREXT): $(OBJS)
    42     43   	$(AR) rcu $@ $^
    43     44   	-$(RANLIB) $@
    44     45   
    45         -libconfig.o: libconfig.c compat.h win32.h config.h libconfig.h
    46         -libconfig_shr.o: libconfig.c compat.h win32.h config.h libconfig.h
    47         -	$(CC) $(CPPFLAGS) $(CFLAGS) $(SHOBJFLAGS) -c -o $@ libconfig.c
           46  +libconfig.o: $(srcdir)/libconfig.c $(srcdir)/compat.h $(srcdir)/win32.h $(srcdir)/config.h libconfig.h
           47  +libconfig_shr.o: $(srcdir)/libconfig.c $(srcdir)/compat.h $(srcdir)/win32.h $(srcdir)/config.h libconfig.h
           48  +
           49  +%_shr.o: $(srcdir)/%.c
           50  +	$(CC) $(CPPFLAGS) $(CFLAGS) $(SHOBJFLAGS) -c -o $@ "$(filter %.c, $^)"
           51  +
           52  +%.o: $(srcdir)/%.c
           53  +	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ "$(filter %.c, $^)"
    48     54   
    49         -%_shr.o: %.c
    50         -	$(CC) $(CPPFLAGS) $(CFLAGS) $(SHOBJFLAGS) -c -o $@ $?
           55  +libconfig.h: $(srcdir)/libconfig.h.in
           56  +	cat "$^" | $(CPP) $(CPPFLAGS) - | grep -v '^#' | grep -v '^ *$$' | sed 's/^!/#  /g;s/__BLANK_LINE__//' > $@
    51     57   
    52         -libconfig.h: libconfig.h.in
    53         -	cat $? | $(CPP) $(CPPFLAGS) - | grep -v '^#' | grep -v '^ *$$' | sed 's/^!/#  /g;s/__BLANK_LINE__//' > $@
    54         -
    55         -test-lc$(EXEEXT): $(LIBS) test-lc.c
           58  +test-lc$(EXEEXT): $(LIBS) $(srcdir)/test-lc.c
    56     59   	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(filter %.c, $^) $(LDFLAGS) -Wl,-R -Wl,. -L. -lconfig
    57     60   
    58     61   .PHONY: clean distclean install
    59     62   clean:
    60     63   	rm -f *.o $(BINS) $(LIBS) libconfig.h *~ test-lc$(EXEEXT) *.dll.a *.dll.def *.dll
           64  +
    61     65   distclean: clean
    62     66   	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
    63         -
    64     67   
    65     68   install: all libconfig.h
    66     69   	-$(INSTALL) -d "$(mandir)"
    67     70   	-$(INSTALL) -d "$(mandir)/man3"
    68     71   	-$(INSTALL) -d "$(libdir)"
    69     72   	-$(INSTALL) -d "$(includedir)"
    70     73   	-$(INSTALL) -m 644 libconfig.$(SHOBJEXT).def "$(libdir)/libconfig.$(SHOBJEXT).def"

Modified configure.ac from [891f8c83fd] to [3eed12d89e].

     1         -AC_REVISION($Revision $)
     2         -AC_INIT(libconfig, 0.2.5)
            1  +AC_INIT(libconfig, 0.2.6)
     3      2   AC_CONFIG_HEADER(config.h)
     4      3   
     5      4   dnl Find out about the host OS
     6      5   DC_CHK_OS_INFO
     7      6   
     8      7   dnl Checks for programs.
     9      8   AC_PROG_CC