From 3731ce516d453ca6163a7f52ca3836bb3b453779 Mon Sep 17 00:00:00 2001 From: Yevgen Muntyan <17531749+muntyan@users.noreply.github.com> Date: Sun, 24 Aug 2008 23:28:47 -0500 Subject: [PATCH] Reverted last changes, they don't make any sense --- ugly/repo/pch.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ugly/repo/pch.mk b/ugly/repo/pch.mk index 440dfc93..409d41f9 100644 --- a/ugly/repo/pch.mk +++ b/ugly/repo/pch.mk @@ -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)