Patch from James Henstridge to update to automake-1.7 (#109542)

[~andy/gtk] / gdk / win32 / Makefile.am

diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 4001c5b3e9bb843e28a8b25c94fc4b6c05377b98..9e11c20949b8ed17e23f8216c271f5b0cbe639b7 100644 (file)
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -2,33 +2,30 @@
 
 libgdkincludedir = $(includedir)/gtk-2.0/gdk
 
-INCLUDES = @STRIP_BEGIN@       \
+INCLUDES = \
        -DG_LOG_DOMAIN=\"Gdk\"  \
        -DINSIDE_GDK_WIN32      \
        -I$(top_srcdir)         \
        -I$(top_srcdir)/gdk     \
        -I$(top_builddir)/gdk   \
-       @GTK_DEBUG_FLAGS@       \
-       @GDK_DEP_CFLAGS@        \
-       @GDK_WIN32_EXTRA_CFLAGS@\
-       -DGDK_COMPILATION       \
-@STRIP_END@
+       $(GTK_DEBUG_FLAGS)      \
+       $(GDK_DEP_CFLAGS)       \
+       $(GDK_WIN32_EXTRA_CFLAGS)\
+       -DGDK_COMPILATION
 
-LDADDS = @STRIP_BEGIN@                 \
-       @GDK_DEP_LIBS@          \
-@STRIP_END@
+LDADDS = $(GDK_DEP_LIBS)
 
 if HAVE_WINTAB
 libwntab32x_a = .libs/libwntab32x.a
 
-.libs/libwntab32x.a: @WINTAB_LIB@
+.libs/libwntab32x.a: $(WINTAB_LIB)
        cp $< $@
 endif
 
 if HAVE_IE55
 libie55uuid_a = .libs/libie55uuid.a
 
-.libs/libie55uuid.a: @IE55_UUID_LIB@
+.libs/libie55uuid.a: $(IE55_UUID_LIB)
        cp $< $@
 endif
 
@@ -81,12 +78,3 @@ libgdkinclude_HEADERS =              \
        gdkwin32.h
 
 libgdk_win32_la_LIBADD = rc/gdk-win32res.lo
-
-###########################################
-# Hack to get gdkenumtypes.h built first
-###########################################
-                                       
-$(libgdk_win32_la_OBJECTS): $(top_srcdir)/gdk/gdkenumtypes.h
-
-$(top_srcdir)/gdk/gdkenumtypes.h:
-       @cd $(top_builddir)/gdk && make $(AM_MAKEFLAGS) gdkenumtypes.h