diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2009-09-27 21:44:29 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2009-09-27 21:44:29 +0000 |
| commit | 43939e66b1d4eeb2f3799c124f3598756755005a (patch) | |
| tree | 15733092de55d52421a6ea02f5a43d5f8ff24393 /lib/util/Makefile | |
| parent | 49f4336c9bba33650573ba780b70bc501b38643e (diff) | |
| download | netpbm-mirror-43939e66b1d4eeb2f3799c124f3598756755005a.tar.gz netpbm-mirror-43939e66b1d4eeb2f3799c124f3598756755005a.tar.xz netpbm-mirror-43939e66b1d4eeb2f3799c124f3598756755005a.zip | |
Rebase Stable series to current Advanced: 10.47.04
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@995 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'lib/util/Makefile')
| -rw-r--r-- | lib/util/Makefile | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/util/Makefile b/lib/util/Makefile index 8f461f28..8b3fa1c1 100644 --- a/lib/util/Makefile +++ b/lib/util/Makefile @@ -5,25 +5,23 @@ endif SUBDIR = lib/util VPATH=.:$(SRCDIR)/$(SUBDIR) -include $(BUILDDIR)/Makefile.config - -INCLUDES = -I $(BUILDDIR) -I $(SRCDIR)/$(SUBDIR)/.. +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 = shhopt.o nstring.o filename.o +UTILOBJECTS = shhopt.o nstring.o vasprintf.o filename.o nsleep.o MERGE_OBJECTS = all: $(UTILOBJECTS) -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk + +INCLUDES = -I$(SRCDIR)/$(SUBDIR) -I. -Iimportinc $(UTILOBJECTS):%.o:%.c importinc - $(CC) -c $(INCLUDES) -DNDEBUG $(CFLAGS) $(CFLAGS_SHLIB) \ + $(CC) -c $(INCLUDES) -DNDEBUG $(CPPFLAGS) $(CFLAGS) $(CFLAGS_SHLIB) \ $(CFLAGS_PERSONAL) $(CADD) -o $@ $< testnstring: test.c nstring.h nstring.o $(CC) $(CFLAGS) $(CADD) -o $@ nstring.o $< - -include Makefile.depend |