Added .spec files for all libtest/ and programs/ WineLib apps.
Updated all Makefiles to use .spec files and new resource handling.
diff --git a/libtest/.cvsignore b/libtest/.cvsignore
index eff5fce..efb2d9a 100644
--- a/libtest/.cvsignore
+++ b/libtest/.cvsignore
@@ -1,13 +1,22 @@
Makefile
expand
+expand.spec.c
hello
+hello.spec.c
hello2
+hello2.spec.c
hello3
-hello3res.h
+hello3.spec.c
hello3res.s
hello4
+hello4.spec.c
hello5
+hello5.spec.c
new
+new.spec.c
rolex
+rolex.spec.c
vartest
+vartest.spec.c
volinfo
+volinfo.spec.c
diff --git a/libtest/Makefile.in b/libtest/Makefile.in
index 1ef3527..8dc50b6 100644
--- a/libtest/Makefile.in
+++ b/libtest/Makefile.in
@@ -3,66 +3,57 @@
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = none
-RCFLAGS = -w32 -h
PROGRAMS = expand hello hello2 hello3 hello4 hello5 new rolex vartest volinfo
ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
-WRCEXTRA = -t -A -p $*
+WRCEXTRA = -s -p $*
-C_SRCS = \
- expand.c \
- hello.c \
- hello2.c \
- hello3.c \
- hello4.c \
- hello5.c \
- new.c \
- rolex.c \
- vartest.c \
- volinfo.c
+SPEC_SRCS = \
+ expand.spec \
+ hello.spec \
+ hello2.spec \
+ hello3.spec \
+ hello4.spec \
+ hello5.spec \
+ new.spec \
+ rolex.spec \
+ vartest.spec \
+ volinfo.spec
RC_SRCS = \
hello3res.rc
-all: check_wrc $(PROGRAMS)
-
-depend:: $(RC_SRCS:.rc=.h)
+all: check_wrc check_winestub $(PROGRAMS)
@MAKE_RULES@
-$(RC_SRCS:.rc=.s): $(WRC)
+expand: expand.o expand.spec.o
+ $(CC) -o expand $+ $(LDOPTIONS) $(ALL_LIBS)
-$(WINESTUB):
- @cd ../library && $(MAKE)
+hello: hello.o hello.spec.o
+ $(CC) -o hello $+ $(LDOPTIONS) $(ALL_LIBS)
-expand: expand.o $(WINESTUB)
- $(CC) -o expand expand.o $(LDOPTIONS) $(ALL_LIBS)
+hello2: hello2.o hello2.spec.o
+ $(CC) -o hello2 $+ $(LDOPTIONS) $(ALL_LIBS)
-hello: hello.o $(WINESTUB)
- $(CC) -o hello hello.o $(LDOPTIONS) $(ALL_LIBS)
+hello3: hello3.o hello3.spec.o hello3res.o
+ $(CC) -o hello3 $+ $(LDOPTIONS) $(ALL_LIBS)
-hello2: hello2.o $(WINESTUB)
- $(CC) -o hello2 hello2.o $(LDOPTIONS) $(ALL_LIBS)
+hello4: hello4.o hello4.spec.o
+ $(CC) -o hello4 $+ $(LDOPTIONS) $(ALL_LIBS)
-hello3: hello3res.o hello3.o $(WINESTUB)
- $(CC) -o hello3 hello3.o hello3res.o $(LDOPTIONS) $(ALL_LIBS)
-hello3.o: hello3res.h
+hello5: hello5.o hello5.spec.o
+ $(CC) -o hello5 $+ $(LDOPTIONS) $(ALL_LIBS)
-hello4: hello4.o $(WINESTUB)
- $(CC) -o hello4 hello4.o $(LDOPTIONS) $(ALL_LIBS)
+new: new.o new.spec.o
+ $(CC) -o new $+ $(LDOPTIONS) $(ALL_LIBS)
-hello5: hello5.o $(WINESTUB)
- $(CC) -o hello5 hello5.o $(LDOPTIONS) $(ALL_LIBS)
+rolex: rolex.o rolex.spec.o
+ $(CC) -o rolex $+ $(LDOPTIONS) $(ALL_LIBS)
-new: new.o $(WINESTUB)
- $(CC) -o new new.o $(LDOPTIONS) $(ALL_LIBS)
+vartest: vartest.o vartest.spec.o
+ $(CC) -o vartest $+ $(LDOPTIONS) $(ALL_LIBS)
-rolex: rolex.o $(WINESTUB)
- $(CC) -o rolex rolex.o $(LDOPTIONS) $(ALL_LIBS)
-
-vartest: vartest.o $(WINESTUB)
- $(CC) -o vartest vartest.o $(LDOPTIONS) $(ALL_LIBS)
-
-volinfo: volinfo.o $(WINESTUB)
- $(CC) -o volinfo volinfo.o $(LDOPTIONS) $(ALL_LIBS)
+volinfo: volinfo.o volinfo.spec.o
+ $(CC) -o volinfo $+ $(LDOPTIONS) $(ALL_LIBS)
### Dependencies:
diff --git a/libtest/expand.spec b/libtest/expand.spec
new file mode 100644
index 0000000..21c495f
--- /dev/null
+++ b/libtest/expand.spec
@@ -0,0 +1,4 @@
+name expand
+mode guiexe
+type win32
+init WinMain
diff --git a/libtest/hello.spec b/libtest/hello.spec
new file mode 100644
index 0000000..623a3d0
--- /dev/null
+++ b/libtest/hello.spec
@@ -0,0 +1,4 @@
+name hello
+mode guiexe
+type win32
+init WinMain
diff --git a/libtest/hello2.spec b/libtest/hello2.spec
new file mode 100644
index 0000000..2b5db6e
--- /dev/null
+++ b/libtest/hello2.spec
@@ -0,0 +1,4 @@
+name hello2
+mode guiexe
+type win32
+init WinMain
diff --git a/libtest/hello3.spec b/libtest/hello3.spec
new file mode 100644
index 0000000..8dd4e4a
--- /dev/null
+++ b/libtest/hello3.spec
@@ -0,0 +1,5 @@
+name hello3
+mode guiexe
+type win32
+init WinMain
+rsrc hello3res
diff --git a/libtest/hello4.spec b/libtest/hello4.spec
new file mode 100644
index 0000000..09699c3
--- /dev/null
+++ b/libtest/hello4.spec
@@ -0,0 +1,4 @@
+name hello4
+mode guiexe
+type win32
+init WinMain
diff --git a/libtest/hello5.spec b/libtest/hello5.spec
new file mode 100644
index 0000000..b619b3c
--- /dev/null
+++ b/libtest/hello5.spec
@@ -0,0 +1,4 @@
+name hello5
+mode guiexe
+type win32
+init WinMain
diff --git a/libtest/new.spec b/libtest/new.spec
new file mode 100644
index 0000000..089b2b6
--- /dev/null
+++ b/libtest/new.spec
@@ -0,0 +1,4 @@
+name new
+mode guiexe
+type win32
+init WinMain
diff --git a/libtest/rolex.spec b/libtest/rolex.spec
new file mode 100644
index 0000000..df8d81b
--- /dev/null
+++ b/libtest/rolex.spec
@@ -0,0 +1,4 @@
+name rolex
+mode guiexe
+type win32
+init WinMain
diff --git a/libtest/vartest.spec b/libtest/vartest.spec
new file mode 100644
index 0000000..1d80e24
--- /dev/null
+++ b/libtest/vartest.spec
@@ -0,0 +1,4 @@
+name vartest
+mode guiexe
+type win32
+init WinMain
diff --git a/libtest/volinfo.spec b/libtest/volinfo.spec
new file mode 100644
index 0000000..a5a94bf
--- /dev/null
+++ b/libtest/volinfo.spec
@@ -0,0 +1,4 @@
+name volinfo
+mode guiexe
+type win32
+init WinMain
