kris/httperf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

idleconn: Now installed along with the httperf executable

Browse Source 
ttest: Remove program from build
This commit is contained in:
tbbulloc 2007-01-17 04:32:36 +00:00
parent afc1008ef1
commit b785396a89
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
httperf/ChangeLog
View File

@ -1,3 +1,11 @@
2007-01-16 Ted Bullock <tbullock@canada.com>
* Build System: Updated build system to a more typical directory
layout and wrote missing makefile.am files for automake
* idleconn: Now installed along with the httperf executable
* ttest: Remove program from build
2007-01-02 Ted Bullock <tbullock@canada.com> 2007-01-02 Ted Bullock <tbullock@canada.com>
*License: Included openssl linking exception *License: Included openssl linking exception

3
httperf/src/Makefile.am
View File

@ -4,7 +4,8 @@ SUBDIRS = gen lib stat
AM_CFLAGS = -Wall -I$(srcdir)/{gen,lib,stat}/ AM_CFLAGS = -Wall -I$(srcdir)/{gen,lib,stat}/
AM_LDFLAGS = -lm AM_LDFLAGS = -lm
bin_PROGRAMS = httperf bin_PROGRAMS = httperf idleconn
httperf_SOURCES = httperf.c object.c call.c conn.c sess.c core.c event.c http.c timer.c httperf_SOURCES = httperf.c object.c call.c conn.c sess.c core.c event.c http.c timer.c
idleconn_SOURCES = idleconn.c
httperf_LDADD = gen/libgen.a lib/libutil.a stat/libstat.a httperf_LDADD = gen/libgen.a lib/libutil.a stat/libstat.a

14
httperf/src/Makefile.in
View File

@ -37,7 +37,7 @@ POST_UNINSTALL = :
build_triplet = @build@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
target_triplet = @target@ target_triplet = @target@
bin_PROGRAMS = httperf$(EXEEXT) bin_PROGRAMS = httperf$(EXEEXT) idleconn$(EXEEXT)
subdir = src subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -55,6 +55,9 @@ am_httperf_OBJECTS = httperf.$(OBJEXT) object.$(OBJEXT) call.$(OBJEXT) \
http.$(OBJEXT) timer.$(OBJEXT) http.$(OBJEXT) timer.$(OBJEXT)
httperf_OBJECTS = $(am_httperf_OBJECTS) httperf_OBJECTS = $(am_httperf_OBJECTS)
httperf_DEPENDENCIES = gen/libgen.a lib/libutil.a stat/libstat.a httperf_DEPENDENCIES = gen/libgen.a lib/libutil.a stat/libstat.a
am_idleconn_OBJECTS = idleconn.$(OBJEXT)
idleconn_OBJECTS = $(am_idleconn_OBJECTS)
idleconn_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles am__depfiles_maybe = depfiles
@ -62,8 +65,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC) CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(httperf_SOURCES) SOURCES = $(httperf_SOURCES) $(idleconn_SOURCES)
DIST_SOURCES = $(httperf_SOURCES) DIST_SOURCES = $(httperf_SOURCES) $(idleconn_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \ html-recursive info-recursive install-data-recursive \
install-exec-recursive install-info-recursive \ install-exec-recursive install-info-recursive \
@ -173,6 +176,7 @@ SUBDIRS = gen lib stat
AM_CFLAGS = -Wall -I$(srcdir)/{gen,lib,stat}/ AM_CFLAGS = -Wall -I$(srcdir)/{gen,lib,stat}/
AM_LDFLAGS = -lm AM_LDFLAGS = -lm
httperf_SOURCES = httperf.c object.c call.c conn.c sess.c core.c event.c http.c timer.c httperf_SOURCES = httperf.c object.c call.c conn.c sess.c core.c event.c http.c timer.c
idleconn_SOURCES = idleconn.c
httperf_LDADD = gen/libgen.a lib/libutil.a stat/libstat.a httperf_LDADD = gen/libgen.a lib/libutil.a stat/libstat.a
all: all-recursive all: all-recursive
@ -233,6 +237,9 @@ clean-binPROGRAMS:
httperf$(EXEEXT): $(httperf_OBJECTS) $(httperf_DEPENDENCIES) httperf$(EXEEXT): $(httperf_OBJECTS) $(httperf_DEPENDENCIES)
@rm -f httperf$(EXEEXT) @rm -f httperf$(EXEEXT)
$(LINK) $(httperf_LDFLAGS) $(httperf_OBJECTS) $(httperf_LDADD) $(LIBS) $(LINK) $(httperf_LDFLAGS) $(httperf_OBJECTS) $(httperf_LDADD) $(LIBS)
idleconn$(EXEEXT): $(idleconn_OBJECTS) $(idleconn_DEPENDENCIES)
@rm -f idleconn$(EXEEXT)
$(LINK) $(idleconn_LDFLAGS) $(idleconn_OBJECTS) $(idleconn_LDADD) $(LIBS)
mostlyclean-compile: mostlyclean-compile:
-rm -f *.$(OBJEXT) -rm -f *.$(OBJEXT)
@ -246,6 +253,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httperf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httperf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idleconn.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sess.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sess.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Po@am__quote@