--- screentest-1.0/Makefile.in.ORIG	2001-08-20 21:28:59 +0300

+++ screentest-1.0/Makefile.in	2004-03-24 22:37:01 +0200

@@ -1,6 +1,6 @@

-# Makefile.in generated automatically by automake 1.4 from Makefile.am

+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am

-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.

+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

 # with or without modifications, as long as this notice is preserved.

@@ -57,36 +57,44 @@

 NORMAL_UNINSTALL = :

 PRE_UNINSTALL = :

 POST_UNINSTALL = :

+host_alias = @host_alias@

+host_triplet = @host@

 CC = @CC@

 GTK_CFLAGS = @GTK_CFLAGS@

 GTK_CONFIG = @GTK_CONFIG@

 GTK_LIBS = @GTK_LIBS@

+HAVE_LIB = @HAVE_LIB@

+LIB = @LIB@

+LTLIB = @LTLIB@

 MAKEINFO = @MAKEINFO@

 PACKAGE = @PACKAGE@

 VERSION = @VERSION@

-INCLUDES =  	@GTK_CFLAGS@

+INCLUDES = \

+	@GTK_CFLAGS@

-EXTRA_DIST = screentest.glade NEW_TESTS screentest.spec install-sh 	mkinstalldirs missing

+EXTRA_DIST = screentest.glade NEW_TESTS screentest.spec install-sh \

+	mkinstalldirs missing

 bin_PROGRAMS = screentest

-noinst_PROGRAMS = screentest.static

-screentest_SOURCES =  	main.c 	support.c support.h 	interface.c interface.h 	callbacks.c callbacks.h 	basic_test.c blink_test.c grid_test.c horizontal_test.c text_test.c 	vertical_test.c 

+screentest_SOURCES = \

+	main.c \

+	support.c support.h \

+	interface.c interface.h \

+	callbacks.c callbacks.h \

+	basic_test.c blink_test.c grid_test.c horizontal_test.c text_test.c \

+	vertical_test.c 

 screentest_LDADD = @GTK_LIBS@

-

-screentest_static_SOURCES = $(screentest_SOURCES)

-screentest_static_LDADD = $(screentest_LDADD)

-screentest_static_LDFLAGS = -static -s

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

 CONFIG_HEADER = config.h

 CONFIG_CLEAN_FILES = 

-PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)

+PROGRAMS =  $(bin_PROGRAMS)

 DEFS = @DEFS@ -I. -I$(srcdir) -I.

@@ -98,10 +106,6 @@

 vertical_test.o

 screentest_DEPENDENCIES = 

 screentest_LDFLAGS = 

-screentest_static_OBJECTS =  main.o support.o interface.o callbacks.o \

-basic_test.o blink_test.o grid_test.o horizontal_test.o text_test.o \

-vertical_test.o

-screentest_static_DEPENDENCIES = 

 CFLAGS = @CFLAGS@

 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

 CCLD = $(CC)

@@ -115,16 +119,19 @@

 TAR = gtar

 GZIP_ENV = --best

-SOURCES = $(screentest_SOURCES) $(screentest_static_SOURCES)

-OBJECTS = $(screentest_OBJECTS) $(screentest_static_OBJECTS)

+DEP_FILES =  .deps/basic_test.P .deps/blink_test.P .deps/callbacks.P \

+.deps/grid_test.P .deps/horizontal_test.P .deps/interface.P \

+.deps/main.P .deps/support.P .deps/text_test.P .deps/vertical_test.P

+SOURCES = $(screentest_SOURCES)

+OBJECTS = $(screentest_OBJECTS)

 all: all-redirect

 .SUFFIXES:

 .SUFFIXES: .S .c .o .s

 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 

-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile

+	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile

-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status

+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)

 	cd $(top_builddir) \

 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status

@@ -189,18 +196,6 @@

 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \

 	done

-mostlyclean-noinstPROGRAMS:

-

-clean-noinstPROGRAMS:

-	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)

-

-distclean-noinstPROGRAMS:

-

-maintainer-clean-noinstPROGRAMS:

-

-.c.o:

-	$(COMPILE) -c $<

-

 .s.o:

 	$(COMPILE) -c $<

@@ -221,10 +216,6 @@

 	@rm -f screentest

 	$(LINK) $(screentest_LDFLAGS) $(screentest_OBJECTS) $(screentest_LDADD) $(LIBS)

-screentest.static: $(screentest_static_OBJECTS) $(screentest_static_DEPENDENCIES)

-	@rm -f screentest.static

-	$(LINK) $(screentest_static_LDFLAGS) $(screentest_static_OBJECTS) $(screentest_static_LDADD) $(LIBS)

-

 tags: TAGS

 ID: $(HEADERS) $(SOURCES) $(LISP)

@@ -292,6 +283,11 @@

 	-rm -rf $(distdir)

 	mkdir $(distdir)

 	-chmod 777 $(distdir)

+	here=`cd $(top_builddir) && pwd`; \

+	top_distdir=`cd $(distdir) && pwd`; \

+	distdir=`cd $(distdir) && pwd`; \

+	cd $(top_srcdir) \

+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile

 	@for file in $(DISTFILES); do \

 	  d=$(srcdir); \

 	  if test -d $$d/$$file; then \

@@ -302,19 +298,38 @@

 	    || cp -p $$d/$$file $(distdir)/$$file || :; \

 	  fi; \

 	done

-basic_test.o: basic_test.c config.h callbacks.h interface.h support.h

-blink_test.o: blink_test.c config.h callbacks.h interface.h support.h

-callbacks.o: callbacks.c config.h callbacks.h interface.h support.h

-grid_test.o: grid_test.c config.h callbacks.h interface.h support.h

-horizontal_test.o: horizontal_test.c config.h callbacks.h interface.h \

-	support.h

-interface.o: interface.c config.h callbacks.h interface.h support.h

-main.o: main.c config.h interface.h support.h

-support.o: support.c config.h support.h

-text_test.o: text_test.c config.h callbacks.h interface.h support.h

-vertical_test.o: vertical_test.c config.h callbacks.h interface.h \

-	support.h

+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)

+

+-include $(DEP_FILES)

+

+mostlyclean-depend:

+

+clean-depend:

+

+distclean-depend:

+	-rm -rf .deps

+

+maintainer-clean-depend:

+

+%.o: %.c

+	@echo '$(COMPILE) -c $<'; \

+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<

+	@-cp .deps/$(*F).pp .deps/$(*F).P; \

+	tr ' ' '\012' < .deps/$(*F).pp \

+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \

+	    >> .deps/$(*F).P; \

+	rm .deps/$(*F).pp

+

+%.lo: %.c

+	@echo '$(LTCOMPILE) -c $<'; \

+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<

+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \

+	  < .deps/$(*F).pp > .deps/$(*F).P; \

+	tr ' ' '\012' < .deps/$(*F).pp \

+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \

+	    >> .deps/$(*F).P; \

+	rm -f .deps/$(*F).pp

 info-am:

 info: info-am

 dvi-am:

@@ -355,27 +370,27 @@

 maintainer-clean-generic:

 mostlyclean-am:  mostlyclean-hdr mostlyclean-binPROGRAMS \

-		mostlyclean-noinstPROGRAMS mostlyclean-compile \

-		mostlyclean-tags mostlyclean-generic

+		mostlyclean-compile mostlyclean-tags mostlyclean-depend \

+		mostlyclean-generic

 mostlyclean: mostlyclean-am

-clean-am:  clean-hdr clean-binPROGRAMS clean-noinstPROGRAMS \

-		clean-compile clean-tags clean-generic mostlyclean-am

+clean-am:  clean-hdr clean-binPROGRAMS clean-compile clean-tags \

+		clean-depend clean-generic mostlyclean-am

 clean: clean-am

-distclean-am:  distclean-hdr distclean-binPROGRAMS \

-		distclean-noinstPROGRAMS distclean-compile \

-		distclean-tags distclean-generic clean-am

+distclean-am:  distclean-hdr distclean-binPROGRAMS distclean-compile \

+		distclean-tags distclean-depend distclean-generic \

+		clean-am

 distclean: distclean-am

 	-rm -f config.status

 maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-binPROGRAMS \

-		maintainer-clean-noinstPROGRAMS \

 		maintainer-clean-compile maintainer-clean-tags \

-		maintainer-clean-generic distclean-am

+		maintainer-clean-depend maintainer-clean-generic \

+		distclean-am

 	@echo "This command is intended for maintainers to use;"

 	@echo "it deletes files that may require special tools to rebuild."

@@ -385,14 +400,13 @@

 .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \

 mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \

 maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \

-mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \

-clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \

 mostlyclean-compile distclean-compile clean-compile \

 maintainer-clean-compile tags mostlyclean-tags distclean-tags \

-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \

-check-am installcheck-am installcheck all-recursive-am install-exec-am \

-install-exec install-data-am install-data install-am install \

-uninstall-am uninstall all-redirect all-am all installdirs \

+clean-tags maintainer-clean-tags distdir mostlyclean-depend \

+distclean-depend clean-depend maintainer-clean-depend info-am info \

+dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \

+install-exec-am install-exec install-data-am install-data install-am \

+install uninstall-am uninstall all-redirect all-am all installdirs \

 mostlyclean-generic distclean-generic clean-generic \

 maintainer-clean-generic clean mostlyclean distclean maintainer-clean