Reverted last changes, they don't make any sense

master
Yevgen Muntyan 2008-08-24 23:28:47 -05:00
parent c6c136d0f0
commit 3731ce516d
1 changed files with 3 additions and 5 deletions

View File

@ -6,9 +6,11 @@ EXTRA_DIST += $(PCH_HEADER)
ugly_base_compile_c = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
ugly_base_compile_cxx = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
ugly_base_compile_objc = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)
COMPILE = $(ugly_base_compile_c)
CXXCOMPILE = $(ugly_base_compile_cxx)
OBJCCOMPILE = $(ugly_base_compile_objc)
if MOO_ENABLE_PCH
@ -16,13 +18,9 @@ BUILT_SOURCES += $(ugly_pch_files)
CLEANFILES += $(ugly_pch_files)
ugly_pch_name = precompiled-header-name
ugly_pch_files = $(ugly_pch_name)-c.gch
ugly_pch_files = $(ugly_pch_name)-c.gch $(ugly_pch_name)-c++.gch
ugly_pch_mk = $(top_srcdir)/ugly/pch.mk
if MOO_USE_CPP
ugly_pch_files += $(ugly_pch_name)-c++.gch
endif
$(ugly_pch_name)-c.gch: $(PCH_HEADER) $(ugly_pch_mk)
$(ugly_base_compile_c) -x c-header -c $< -o $@
$(ugly_pch_name)-c++.gch: $(PCH_HEADER) $(ugly_pch_mk)