Skip to content

Commit

Permalink
apply debian patches
Browse files Browse the repository at this point in the history
svn path=/trunk/icecream/; revision=559919
  • Loading branch information
coolo committed Jul 8, 2006
1 parent 26af20f commit d9fc998
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion client/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/../services
bin_PROGRAMS = icecc
pkglib_SCRIPTS = icecc-create-env
icecc_SOURCES = main.cpp arg.cpp cpp.cpp local.cpp remote.cpp util.cpp md5.c safeguard.cpp
icecc_LDADD = ../services/libicecream.la
icecc_LDADD = ../services/libicecc.la

CLEANFILES = icecc++

Expand Down
2 changes: 1 addition & 1 deletion configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ AC_PREREQ(2.53)

AC_INIT(client/main.cpp)

AM_INIT_AUTOMAKE(icecream, "0.7.3a")
AM_INIT_AUTOMAKE(icecc, "0.7.4")
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_HOST

Expand Down
2 changes: 1 addition & 1 deletion daemon/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ INCLUDES = -I$(srcdir)/../services

sbin_PROGRAMS = iceccd
iceccd_SOURCES = ncpus.c main.cpp serve.cpp workit.cpp environment.cpp load.cpp
iceccd_LDADD = ../services/libicecream.la
iceccd_LDADD = ../services/libicecc.la
14 changes: 7 additions & 7 deletions services/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
INCLUDES = -I$(srcdir)/../minilzo

lib_LTLIBRARIES = libicecream.la
lib_LTLIBRARIES = libicecc.la

libicecream_la_SOURCES = job.cpp comm.cpp getifaddrs.cpp logging.cpp tempfile.c
libicecream_la_LIBADD = ../minilzo/libminilzo.la
libicecream_la_CFLAGS = -fPIC -DPIC
libicecream_la_CXXFLAGS = -fPIC -DPIC
libicecc_la_SOURCES = job.cpp comm.cpp getifaddrs.cpp logging.cpp tempfile.c
libicecc_la_LIBADD = ../minilzo/libminilzo.la
libicecc_la_CFLAGS = -fPIC -DPIC
libicecc_la_CXXFLAGS = -fPIC -DPIC

ice_HEADERS = job.h comm.h
icedir = $(includedir)/icecream
icedir = $(includedir)/icecc

sbin_PROGRAMS = scheduler
scheduler_SOURCES = scheduler.cpp
scheduler_LDADD = libicecream.la
scheduler_LDADD = libicecc.la

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = icecream.pc
Expand Down
8 changes: 4 additions & 4 deletions services/icecream.pc.in
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# icecream pkg-config file
# icecc pkg-config file

prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: icecream
Description: icecream is a library for connecting to icecream schedulers
Name: icecc
Description: icecc is a library for connecting to icecc schedulers
Version: @VERSION@
Requires:
Conflicts:
Libs: -L${libdir} -licecream
Libs: -L${libdir} -licecc
Cflags: -I${includedir}

0 comments on commit d9fc998

Please sign in to comment.