Commit 35c91f6e authored by Guenter Knauf's avatar Guenter Knauf
Browse files

renamed generated config.h to ares_config.h in order to avoid clashes when... 

renamed generated config.h to ares_config.h in order to avoid clashes when libcurl is used with other projects which also have a config.h.
parent f5f93540

ares/.cvsignore

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ ares_build.h 
ares_version.h.dist

autom4te.cache

config.guess

config.h

config.h.in

ares_config.h

ares_config.h.in

config.log

config.lt

config.status

ares/CHANGES

+4 −0
Original line number Diff line number Diff line 
  Changelog for the c-ares project



* 14 Jul 2009 (Guenter Knauf)

- renamed generated config.h to ares_config.h to avoid any future clashes

  with config.h from other projects.

  

* June 8 2009 (Yang Tse)

- Removed buildconf.bat from release and daily snapshot archives. This

  file is only for CVS tree checkout builds.

ares/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ ACLOCAL_AMFLAGS = -I m4 
#

# $(top_builddir)/../include is for libcurl's generated curl/curlbuild.h file

# $(top_srcdir)/../include is for libcurl's external include files

# $(top_builddir) is for c-ares's generated config.h file

# $(top_builddir) is for c-ares's generated ares_config.h file

# $(top_srcdir) is for c-ares's lib/setup.h and other "c-ares-private" files



if CURLDEBUG

ares/Makefile.dj

+3 −3
Original line number Diff line number Diff line
@@ -37,13 +37,13 @@ EX_LIBS += $(WATT32_ROOT)/lib/libwatt.a 


OBJECTS = $(addprefix $(OBJ_DIR)/, $(CSOURCES:.c=.o))



all: $(OBJ_DIR) config.h libcares.a ahost.exe adig.exe acountry.exe

all: $(OBJ_DIR) ares_config.h libcares.a ahost.exe adig.exe acountry.exe

	@echo Welcome to c-ares.



libcares.a: $(OBJECTS)

	ar rs $@ $?



config.h: config.dos

ares_config.h: config.dos

	$(COPY) $^ $@



ahost.exe: ahost.c $(OBJ_DIR)/ares_getopt.o $(OBJ_HACK)
@@ -58,7 +58,7 @@ acountry.exe: acountry.c $(OBJ_DIR)/ares_getopt.o $(OBJ_HACK) 
# clean generated files

#

genclean:

	- $(DELETE) config.h

	- $(DELETE) ares_config.h



# clean object files and subdir

#

ares/Makefile.netware

+3 −3
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ lib: prebuild $(LTARGET) 


nlm: prebuild $(TARGETS)



prebuild: $(OBJDIR) ares_build.h $(OBJDIR)/version.inc config.h

prebuild: $(OBJDIR) ares_build.h $(OBJDIR)/version.inc ares_config.h



install: $(INSTDIR) all

	@$(CP) *.nlm $(INSTDIR)
@@ -170,7 +170,7 @@ install: $(INSTDIR) all 
	@$(CP) ../RELEASE-NOTES $(INSTDIR)



clean:

	-$(RM) $(LTARGET) $(TARGETS) config.h

	-$(RM) $(LTARGET) $(TARGETS) ares_config.h

	-$(RM) -r $(OBJDIR)

	-$(RM) -r arpa
@@ -269,7 +269,7 @@ ifeq ($(LD),nlmconv) 
	@echo $(DL)output $(notdir $(@:.def=.nlm))$(DL) >> $@

endif



config.h: Makefile.netware

ares_config.h: Makefile.netware

	@echo Creating $@

	@echo $(DL)/* $@ for NetWare target.$(DL) > $@

	@echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@