Index: Makefile.in ================================================================== --- Makefile.in +++ Makefile.in @@ -1,13 +1,13 @@ CC = @CC@ LN_S = @LN_S@ AR = @AR@ RANLIB = @RANLIB@ CPP = @CPP@ -CFLAGS = -Wall @CFLAGS@ @DEFS@ +CFLAGS = @CFLAGS@ @DEFS@ CPPFLAGS = @CPPFLAGS@ @DEFS@ -LDFLAGS = @LDFLAGS@ @LIBS@ +LDFLAGS = @LDFLAGS@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ OBJEXT = @OBJEXT@ PATH_SEPARATOR = @PATH_SEPARATOR@ SHOBJFLAGS = @SHOBJFLAGS@ @@ -25,10 +25,11 @@ datadir = @datadir@ exec_prefix = @exec_prefix@ bindir = @bindir@ libdir = @libdir@ includedir = @includedir@ +srcdir = @srcdir@ LIBS = libconfig.$(AREXT) libconfig.$(SHOBJEXT) BINS = # 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@ @@ -40,29 +41,31 @@ libconfig.$(AREXT): $(OBJS) $(AR) rcu $@ $^ -$(RANLIB) $@ -libconfig.o: libconfig.c compat.h win32.h config.h libconfig.h -libconfig_shr.o: libconfig.c compat.h win32.h config.h libconfig.h - $(CC) $(CPPFLAGS) $(CFLAGS) $(SHOBJFLAGS) -c -o $@ libconfig.c - -%_shr.o: %.c - $(CC) $(CPPFLAGS) $(CFLAGS) $(SHOBJFLAGS) -c -o $@ $? - -libconfig.h: libconfig.h.in - cat $? | $(CPP) $(CPPFLAGS) - | grep -v '^#' | grep -v '^ *$$' | sed 's/^!/# /g;s/__BLANK_LINE__//' > $@ - -test-lc$(EXEEXT): $(LIBS) test-lc.c +libconfig.o: $(srcdir)/libconfig.c $(srcdir)/compat.h $(srcdir)/win32.h $(srcdir)/config.h libconfig.h +libconfig_shr.o: $(srcdir)/libconfig.c $(srcdir)/compat.h $(srcdir)/win32.h $(srcdir)/config.h libconfig.h + +%_shr.o: $(srcdir)/%.c + $(CC) $(CPPFLAGS) $(CFLAGS) $(SHOBJFLAGS) -c -o $@ "$(filter %.c, $^)" + +%.o: $(srcdir)/%.c + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ "$(filter %.c, $^)" + +libconfig.h: $(srcdir)/libconfig.h.in + cat "$^" | $(CPP) $(CPPFLAGS) - | grep -v '^#' | grep -v '^ *$$' | sed 's/^!/# /g;s/__BLANK_LINE__//' > $@ + +test-lc$(EXEEXT): $(LIBS) $(srcdir)/test-lc.c $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(filter %.c, $^) $(LDFLAGS) -Wl,-R -Wl,. -L. -lconfig .PHONY: clean distclean install clean: rm -f *.o $(BINS) $(LIBS) libconfig.h *~ 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 - install: all libconfig.h -$(INSTALL) -d "$(mandir)" -$(INSTALL) -d "$(mandir)/man3" -$(INSTALL) -d "$(libdir)" Index: configure.ac ================================================================== --- configure.ac +++ configure.ac @@ -1,7 +1,6 @@ -AC_REVISION($Revision $) -AC_INIT(libconfig, 0.2.5) +AC_INIT(libconfig, 0.2.6) AC_CONFIG_HEADER(config.h) dnl Find out about the host OS DC_CHK_OS_INFO