Forgot resource sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 8bd800e8184074a8cc421061372bf43e50528483..a5e6ac3d95907f023c10198cfd44e10fec772a9a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 15:24, 1999/10/12
+# This file was automatically generated by tmake at 16:24, 1999/10/13
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -2378,6 +2378,18 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/png/*.cpp $(DISTDIR)/samples/png
        cp $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png
        cp $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png
+       mkdir $(DISTDIR)/samples/resource
+       cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
+       cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource
+       cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
+       cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
+       mkdir $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/*.h $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit
        mkdir $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist

diff --git a/configure.in b/configure.in
index e654c9f09e1db501561878b5401b0b904abb5906..2bbce273d46308b501789cfad04137dd404e826c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2953,6 +2953,7 @@ AC_OUTPUT([
             samples/printing/Makefile
            samples/proplist/Makefile
             samples/richedit/Makefile
+            samples/resource/Makefile
             samples/sashtest/Makefile
             samples/scroll/Makefile
             samples/splitter/Makefile

diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t
index 29e03dac1ae3aee2ed0340a2c8a9b3d4b9700836..692551a6c9f985364d1d63c4b6b793e9c53a0f55 100644 (file)
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -934,6 +934,18 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/png/*.cpp $(DISTDIR)/samples/png
        cp $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png
        cp $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png
+       mkdir $(DISTDIR)/samples/resource
+       cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
+       cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource
+       cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
+       cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
+       mkdir $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/*.h $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit
        mkdir $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist

diff --git a/samples/resource/.cvsignore b/samples/resource/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/samples/resource/.cvsignore
+++ b/samples/resource/.cvsignore
@@ -1,2 +1 @@
-Makefile.in
 

diff --git a/samples/resource/Makefile.am b/samples/resource/Makefile.am
deleted file mode 100644 (file)
index 1545a26..0000000
--- a/samples/resource/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = 1.3 no-dependencies
-
-SUFFIXES = .cpp
-
-DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)
-
-noinst_PROGRAMS = resource
-
-resource_SOURCES = resource.cpp

diff --git a/samples/resource/Makefile.in b/samples/resource/Makefile.in
new file mode 100644 (file)
index 0000000..853932a
--- /dev/null
+++ b/samples/resource/Makefile.in
@@ -0,0 +1,21 @@
+#
+# File:                Makefile.in
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for resource example (UNIX).
+
+top_srcdir = @top_srcdir@
+top_builddir = ../..
+program_dir = samples/resource
+
+PROGRAM=resource
+
+OBJECTS=$(PROGRAM).o
+
+include ../../src/makeprog.env
+

diff --git a/utils/dialoged/src/Makefile b/utils/dialoged/src/Makefile
new file mode 100644 (file)
index 0000000..d754615
--- /dev/null
+++ b/utils/dialoged/src/Makefile
@@ -0,0 +1,51 @@
+#
+# File:                Makefile
+# Author:      Robert Roebling
+# Created:     1999
+# Updated:     
+# Copyright:   (c) 1998 Robert Roebling
+#
+# Makefile for Dialog Editor (GTK version)
+#
+# This makefile requires wxWindows/GTK to be 
+# installed (possibly using "make install")
+# on your system.
+#
+
+CC = g++
+
+DialogEd: dialoged.o dlghndlr.o edlist.o edtree.o reseditr.o reswrite.o \
+       symbtabl.o winprop.o winstyle.o
+       $(CC) -o DialogEd \
+       dialoged.o dlghndlr.o edlist.o edtree.o reseditr.o reswrite.o \
+       symbtabl.o winprop.o winstyle.o `wx-config --libs`
+
+dialoged.o: dialoged.cpp
+       $(CC) `wx-config --cflags` -c dialoged.cpp
+
+dlghndlr.o: dlghndlr.cpp
+       $(CC) `wx-config --cflags` -c dlghndlr.cpp
+
+edlist.o: edlist.cpp
+       $(CC) `wx-config --cflags` -c edlist.cpp
+
+edtree.o: edtree.cpp
+       $(CC) `wx-config --cflags` -c edtree.cpp
+
+reseditr.o: reseditr.cpp
+       $(CC) `wx-config --cflags` -c reseditr.cpp
+
+reswrite.o: reswrite.cpp
+       $(CC) `wx-config --cflags` -c reswrite.cpp
+
+symbtabl.o: symbtabl.cpp
+       $(CC) `wx-config --cflags` -c symbtabl.cpp
+
+winprop.o: winprop.cpp
+       $(CC) `wx-config --cflags` -c winprop.cpp
+
+winstyle.o: winstyle.cpp
+       $(CC) `wx-config --cflags` -c winstyle.cpp
+
+clean: 
+       rm -f *.o DialogEd