diff options
| author | Alasdair Kergon <agk@redhat.com> | 2008-05-19 20:06:34 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2008-05-19 20:06:34 +0000 |
| commit | 25fbec5be1f5fd77519b58565e504c705ece696c (patch) | |
| tree | b9c8b7f384a55d0c4cefb3a3ad2db4ad259c15d2 /make.tmpl.in | |
| parent | fc54be1062ad0146ab303d5bd5ef1664faea759c (diff) | |
| download | lvm2-25fbec5be1f5fd77519b58565e504c705ece696c.tar.gz | |
revert accidental checkin
Diffstat (limited to 'make.tmpl.in')
| -rw-r--r-- | make.tmpl.in | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/make.tmpl.in b/make.tmpl.in index d72d42c22..2f8e9a496 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -26,7 +26,6 @@ LN_S = @LN_S@ LIBS = @LIBS@ DEFS += @DEFS@ CFLAGS += @CFLAGS@ -CPPFLAGS += @CPPFLAGS@ CLDFLAGS += @CLDFLAGS@ LDDEPS += @LDDEPS@ LDFLAGS += @LDFLAGS@ @@ -95,14 +94,14 @@ STRIP= LIB_VERSION := $(shell cat $(top_srcdir)/VERSION | \ awk -F '.' '{printf "%s.%s",$$1,$$2}') -CPPFLAGS := -I$(top_srcdir)/include $(CPPFLAGS) +INCLUDES += -I$(top_srcdir)/include ifneq ("@DMDIR@", "") - CPPFLAGS += -I@DMDIR@/include + INCLUDES += -I@DMDIR@/include endif ifdef DESTDIR - CPPFLAGS += -I$(DESTDIR)/usr/include + INCLUDES += -I$(DESTDIR)/usr/include endif INC_LNS = $(top_srcdir)/include/.symlinks_created @@ -162,14 +161,14 @@ endif $(TARGETS): $(OBJECTS) %.o: %.c - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $< -o $@ + $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $< -o $@ %.pot: %.c Makefile - $(CC) -E $(CPPFLAGS) -include $(top_srcdir)/include/pogen.h \ + $(CC) -E $(INCLUDES) -include $(top_srcdir)/include/pogen.h \ $(DEFS) $(CFLAGS) $< > $@ %.so: %.o - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $< -o $@ + $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $< -o $@ ifeq ("@LIB_SUFFIX@","so") $(LIB_SHARED): $(OBJECTS) $(LDDEPS) @@ -196,7 +195,7 @@ $(LIB_STATIC): $(OBJECTS) set -e; \ FILE=`echo $@ | sed 's/\\//\\\\\\//g;s/\\.d//g'`; \ DEPS=`echo $(DEPS) | sed -e 's/\\//\\\\\\//g'`; \ - $(CC) -MM $(CPPFLAGS) $(DEFS) $(CFLAGS) $< | \ + $(CC) -MM $(INCLUDES) $(DEFS) $(CFLAGS) $< | \ sed "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" > $@; \ [ -s $@ ] || $(RM) $@ |