diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-06-21 21:26:50 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-06-21 21:26:50 +0000 |
| commit | 35445f1fd6e4044a09848879e4eaf1cf6c8ad849 (patch) | |
| tree | 82dcca2fb724e4c07f7bb13d89deabfa0796ddcf /lib | |
| parent | 8ca50b58a2154bf926311dcee75b8a5f93aa84ed (diff) | |
| download | netpbm-mirror-35445f1fd6e4044a09848879e4eaf1cf6c8ad849.tar.gz netpbm-mirror-35445f1fd6e4044a09848879e4eaf1cf6c8ad849.tar.xz netpbm-mirror-35445f1fd6e4044a09848879e4eaf1cf6c8ad849.zip | |
Move bitio.h to util/bitio.h
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2560 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 5 | ||||
| -rw-r--r-- | lib/util/Makefile | 1 | ||||
| -rw-r--r-- | lib/util/bitio.c (renamed from lib/bitio.c) | 0 | ||||
| -rw-r--r-- | lib/util/bitio.h (renamed from lib/bitio.h) | 0 |
4 files changed, 4 insertions, 2 deletions
diff --git a/lib/Makefile b/lib/Makefile index 19557909..fa73d194 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -25,7 +25,7 @@ else LIBSYSTEM = libsystem.o endif -LIBOBJECTS = libpm.o pmfileio.o fileio.o bitio.o colorname.o \ +LIBOBJECTS = libpm.o pmfileio.o fileio.o colorname.o \ libpamd.o \ libpbm1.o libpbm2.o libpbm3.o libpbmfont.o \ libpgm1.o libpgm2.o \ @@ -39,6 +39,7 @@ LIBOBJECTS = libpm.o pmfileio.o fileio.o bitio.o colorname.o \ # Library objects to be linked but not built by common.mk: LIBOBJECTS_X = \ + util/bitio.o \ util/filename.o \ util/io.o \ util/mallocvar.o \ @@ -52,7 +53,7 @@ LIBOBJECTS_X = \ MANUALS3 = libnetpbm MANUALS5 = pbm pgm ppm pnm pam -INTERFACE_HEADERS = bitio.h colorname.h \ +INTERFACE_HEADERS = colorname.h \ pam.h pamdraw.h pammap.h pbm.h pbmfont.h \ pgm.h pm.h pm_gamma.h pm_system.h pnm.h \ ppm.h ppmcmap.h ppmdfont.h ppmdraw.h ppmfloyd.h \ diff --git a/lib/util/Makefile b/lib/util/Makefile index 28dfddfe..c8522a04 100644 --- a/lib/util/Makefile +++ b/lib/util/Makefile @@ -12,6 +12,7 @@ include $(BUILDDIR)/config.mk # nstring is required for asprintf(), etc. Also some systems don't have # snprintf(), e.g. Solaris 2.5.1. 2002.03.29. UTILOBJECTS = \ + bitio.o \ filename.o \ io.o \ mallocvar.o \ diff --git a/lib/bitio.c b/lib/util/bitio.c index ca1b55f9..ca1b55f9 100644 --- a/lib/bitio.c +++ b/lib/util/bitio.c diff --git a/lib/bitio.h b/lib/util/bitio.h index dfc5a153..dfc5a153 100644 --- a/lib/bitio.h +++ b/lib/util/bitio.h |