diff options
| author | Thies C. Arntzen <thies@php.net> | 2001-05-18 14:40:02 +0000 |
|---|---|---|
| committer | Thies C. Arntzen <thies@php.net> | 2001-05-18 14:40:02 +0000 |
| commit | e80abfa40c6b28ba8193c454f63b31bf96ce1454 (patch) | |
| tree | 5f3cb147563158544ca4e124adabfcb5531717f4 /build | |
| parent | 473d3eae454d47b8c6730635f975caa5e1081420 (diff) | |
| download | php-git-e80abfa40c6b28ba8193c454f63b31bf96ce1454.tar.gz | |
revert parts of last commit - stupid me!
Diffstat (limited to 'build')
| -rw-r--r-- | build/rules_common.mk | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/build/rules_common.mk b/build/rules_common.mk index 9072a71ed0..bab3a16343 100644 --- a/build/rules_common.mk +++ b/build/rules_common.mk @@ -23,10 +23,10 @@ COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) COMPILE = $(CC) $(COMMON_FLAGS) $(CFLAGS) $(EXTRA_CFLAGS) CXX_COMPILE = $(CXX) $(COMMON_FLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) -SHARED_COMPILE = $(SHARED_LIBTOOL) --silent --mode=compile $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) -prefer-pic $(EXTRA_CFLAGS) -c $< && touch $@ -CXX_SHARED_COMPILE = $(SHARED_LIBTOOL) --silent --mode=compile $(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) -prefer-pic $(EXTRA_CXXFLAGS) -c $< && touch $@ +SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) -prefer-pic $(EXTRA_CFLAGS) -c $< && touch $@ +CXX_SHARED_COMPILE = $(SHARED_LIBTOOL) --mode=compile $(CXX) $(COMMON_FLAGS) $(CXXFLAGS_CLEAN) -prefer-pic $(EXTRA_CXXFLAGS) -c $< && touch $@ -LINK = $(LIBTOOL) --silent --mode=link $(COMPILE) $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --mode=link $(COMPILE) $(LDFLAGS) -o $@ mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p INSTALL = $(top_srcdir)/build/shtool install -c @@ -42,36 +42,28 @@ CXX_SUFFIX = .cpp .SUFFIXES: .slo .c $(CXX_SUFFIX) .lo .o .s .y .l .c.o: - @echo Compiling $< - @$(COMPILE) -c $< + $(COMPILE) -c $< $(CXX_SUFFIX).o: - @echo Compiling $< - @$(CXX_COMPILE) -c $< + $(CXX_COMPILE) -c $< .s.o: - @echo Compiling $< - @$(COMPILE) -c $< + $(COMPILE) -c $< .c.lo: - @echo Compiling $< - @$(PHP_COMPILE) + $(PHP_COMPILE) $(CXX_SUFFIX).lo: - @echo Compiling $< - @$(CXX_PHP_COMPILE) + $(CXX_PHP_COMPILE) .s.lo: - @echo Compiling $< - @$(PHP_COMPILE) + $(PHP_COMPILE) .c.slo: - @echo Compiling $< - @$(SHARED_COMPILE) + $(SHARED_COMPILE) $(CXX_SUFFIX).slo: - @echo Compiling $< - @$(CXX_SHARED_COMPILE) + $(CXX_SHARED_COMPILE) .y.c: $(YACC) $(YFLAGS) $< && mv y.tab.c $*.c |