Commit 3dc5d946 authored by Ulrich Weigand's avatar Ulrich Weigand Committed by Alexandre Julliard

Added .spec files for all libtest/ and programs/ WineLib apps.

Updated all Makefiles to use .spec files and new resource handling.
parent 9ffd4030
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
......@@ -3,66 +3,57 @@ TOPOBJDIR = ..
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 $*
C_SRCS = \
expand.c \
hello.c \
hello2.c \
hello3.c \
hello4.c \
hello5.c \
new.c \
rolex.c \
vartest.c \
volinfo.c
WRCEXTRA = -s -p $*
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)
$(WINESTUB):
@cd ../library && $(MAKE)
expand: expand.o $(WINESTUB)
$(CC) -o expand expand.o $(LDOPTIONS) $(ALL_LIBS)
expand: expand.o expand.spec.o
$(CC) -o expand $+ $(LDOPTIONS) $(ALL_LIBS)
hello: hello.o $(WINESTUB)
$(CC) -o hello hello.o $(LDOPTIONS) $(ALL_LIBS)
hello: hello.o hello.spec.o
$(CC) -o hello $+ $(LDOPTIONS) $(ALL_LIBS)
hello2: hello2.o $(WINESTUB)
$(CC) -o hello2 hello2.o $(LDOPTIONS) $(ALL_LIBS)
hello2: hello2.o hello2.spec.o
$(CC) -o hello2 $+ $(LDOPTIONS) $(ALL_LIBS)
hello3: hello3res.o hello3.o $(WINESTUB)
$(CC) -o hello3 hello3.o hello3res.o $(LDOPTIONS) $(ALL_LIBS)
hello3.o: hello3res.h
hello3: hello3.o hello3.spec.o hello3res.o
$(CC) -o hello3 $+ $(LDOPTIONS) $(ALL_LIBS)
hello4: hello4.o $(WINESTUB)
$(CC) -o hello4 hello4.o $(LDOPTIONS) $(ALL_LIBS)
hello4: hello4.o hello4.spec.o
$(CC) -o hello4 $+ $(LDOPTIONS) $(ALL_LIBS)
hello5: hello5.o $(WINESTUB)
$(CC) -o hello5 hello5.o $(LDOPTIONS) $(ALL_LIBS)
hello5: hello5.o hello5.spec.o
$(CC) -o hello5 $+ $(LDOPTIONS) $(ALL_LIBS)
new: new.o $(WINESTUB)
$(CC) -o new new.o $(LDOPTIONS) $(ALL_LIBS)
new: new.o new.spec.o
$(CC) -o new $+ $(LDOPTIONS) $(ALL_LIBS)
rolex: rolex.o $(WINESTUB)
$(CC) -o rolex rolex.o $(LDOPTIONS) $(ALL_LIBS)
rolex: rolex.o rolex.spec.o
$(CC) -o rolex $+ $(LDOPTIONS) $(ALL_LIBS)
vartest: vartest.o $(WINESTUB)
$(CC) -o vartest vartest.o $(LDOPTIONS) $(ALL_LIBS)
vartest: vartest.o vartest.spec.o
$(CC) -o vartest $+ $(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:
name expand
mode guiexe
type win32
init WinMain
name hello
mode guiexe
type win32
init WinMain
name hello2
mode guiexe
type win32
init WinMain
name hello3
mode guiexe
type win32
init WinMain
rsrc hello3res
name hello4
mode guiexe
type win32
init WinMain
name hello5
mode guiexe
type win32
init WinMain
name new
mode guiexe
type win32
init WinMain
name rolex
mode guiexe
type win32
init WinMain
name vartest
mode guiexe
type win32
init WinMain
name volinfo
mode guiexe
type win32
init WinMain
Makefile
icinfo
icinfo.spec.c
aviplay
aviplay.spec.c
aviinfo
aviinfo.spec.c
......@@ -6,31 +6,25 @@ VPATH = @srcdir@
MODULE = none
PROGRAMS = icinfo aviinfo aviplay
ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
RCFLAGS = -w32 -h
WRCEXTRA = -t -A -p $*
WRCEXTRA = -s -p $*
LANGUAGES =
LICENSELANG =
SPEC_SRCS = \
icinfo.spec \
aviinfo.spec \
aviplay.spec
MOSTSRCS = \
icinfo.c \
aviinfo.c \
aviinfo.c
MOSTOBJS = $(MOSTSRCS:.c=.o)
all: check_wrc $(PROGRAMS)
all: check_wrc check_winestub $(PROGRAMS)
@MAKE_RULES@
# Override resource compiler rules
icinfo: icinfo.o $(WINESTUB)
$(CC) -o icinfo icinfo.o $(LDOPTIONS) $(ALL_LIBS)
icinfo: icinfo.o icinfo.spec.o
$(CC) -o icinfo icinfo.o icinfo.spec.o $(LDOPTIONS) $(ALL_LIBS)
aviinfo: aviinfo.o aviinfo.spec.o
$(CC) -o aviinfo aviinfo.o aviinfo.spec.o $(LDOPTIONS) $(ALL_LIBS)
aviinfo: aviinfo.o $(WINESTUB)
$(CC) -o aviinfo aviinfo.o $(LDOPTIONS) $(ALL_LIBS)
aviplay: aviplay.o $(WINESTUB)
$(CC) -o aviplay aviplay.o $(LDOPTIONS) $(ALL_LIBS)
aviplay: aviplay.o aviplay.spec.o
$(CC) -o aviplay aviplay.o aviplay.spec.o $(LDOPTIONS) $(ALL_LIBS)
install::
$(INSTALL_PROGRAM) icinfo $(bindir)/icinfo
......
name aviinfo
mode guiexe
type win32
init WinMain
name aviplay
mode guiexe
type win32
init WinMain
name icinfo
mode guiexe
type win32
init WinMain
Da.s
De.s
En.s
Es.s
Fi.s
Fr.s
Makefile
Pt.s
Sw.s
Wa.s
clock
clock.spec.c
rsrc.s
......@@ -6,7 +6,7 @@ VPATH = @srcdir@
MODULE = none
PROGRAMS = clock
ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
WRCEXTRA = -t -A -p clock
WRCEXTRA = -s -p clock
LICENSELANG = En
......@@ -17,9 +17,11 @@ C_SRCS = \
main.c \
$(LICENSELANG:%=License_%.c)
SPEC_SRCS = clock.spec
RC_SRCS = rsrc.rc
all: check_wrc $(PROGRAMS)
all: check_wrc check_winestub $(PROGRAMS)
@MAKE_RULES@
......@@ -28,7 +30,7 @@ all: check_wrc $(PROGRAMS)
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -o $*.s
clock: $(OBJS) $(WINESTUB)
clock: $(OBJS)
$(CC) -o clock $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
install::
......
name clock
mode guiexe
type win32
init WinMain
rsrc clock
Makefile
cmdlgr.h
cmdlgr.s
cmdlgtst
cmdlgtst.spec.c
......@@ -6,30 +6,22 @@ VPATH = @srcdir@
MODULE = none
PROGRAMS = cmdlgtst
ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
RCFLAGS = -w32 -h
WRCEXTRA = -t -A -p $*
WRCEXTRA = -s -p cmdlgtst
C_SRCS = \
cmdlgtst.c
SPEC_SRCS = \
cmdlgtst.spec
RC_SRCS = \
cmdlgr.rc
all: check_wrc $(PROGRAMS)
depend:: $(RC_SRCS:.rc=.h)
all: check_wrc check_winestub $(PROGRAMS)
@MAKE_RULES@
# Override resource compiler rules
.rc.s:
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -o $*.s
.rc.h:
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
cmdlgtst: $(OBJS) $(WINESTUB)
cmdlgtst: $(OBJS)
$(CC) -o cmdlgtst $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
install::
......@@ -38,6 +30,4 @@ install::
uninstall::
$(RM) $(bindir)/cmdlgtst
$(RC_SRCS:.rc=.s): $(WRC)
### Dependencies:
name cmdlgtst
mode guiexe
type win32
init WinMain
rsrc cmdlgtst
......@@ -9,11 +9,13 @@ ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
C_SRCS = control.c
all: $(PROGRAMS)
SPEC_SRCS = control.spec
all: check_winestub $(PROGRAMS)
@MAKE_RULES@
control: $(OBJS) $(WINESTUB)
control: $(OBJS)
$(CC) -o control $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
install::
......
name control
mode guiexe
type win32
init WinMain
Da.s
De.s
En.s
Es.s
Fi.s
Fr.s
Makefile
Pt.s
Sw.s
notepad
notepad.spec.c
rsrc.s
......@@ -6,7 +6,7 @@ VPATH = @srcdir@
MODULE = none
PROGRAMS = notepad
ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
WRCEXTRA = -t -A -p notepad
WRCEXTRA = -s -p notepad
LICENSELANG = En
......@@ -18,9 +18,11 @@ C_SRCS = \
search.c \
$(LICENSELANG:%=License_%.c)
SPEC_SRCS = notepad.spec
RC_SRCS = rsrc.rc
all: check_wrc $(PROGRAMS)
all: check_wrc check_winestub $(PROGRAMS)
@MAKE_RULES@
......@@ -28,7 +30,7 @@ all: check_wrc $(PROGRAMS)
.rc.s:
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -o $*.s
notepad: $(OBJS) $(WINESTUB)
notepad: $(OBJS)
$(CC) -o notepad $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
install::
......
name notepad
mode guiexe
type win32
init WinMain
rsrc notepad
Makefile
osversioncheck
osversioncheck.spec.c
......@@ -9,6 +9,8 @@ ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
C_SRCS = osversioncheck.c
SPEC_SRCS = osversioncheck.spec
all: $(PROGRAMS)
@MAKE_RULES@
......
name osversioncheck
mode cuiexe
type win32
init main
Da.h
Da.s
De.h
De.s
En.h
En.s
Es.h
Es.s
Fi.h
Fi.s
Fr.h
Fr.s
Hu.h
Hu.s
It.h
It.s
Ko.h
Ko.s
Makefile
Pt.h
Pt.s
Sw.h
Sw.s
Va.h
Va.s
Wa.h
Wa.s
accel.h
accel.s
progman
progman.spec.c
rsrc.s
......@@ -6,7 +6,7 @@ VPATH = @srcdir@
MODULE = none
PROGRAMS = progman
ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
WRCEXTRA = -t -A -p progman
WRCEXTRA = -s -p progman
LICENSELANG = En
......@@ -20,9 +20,11 @@ C_SRCS = \
string.c \
$(LICENSELANG:%=License_%.c)
SPEC_SRCS = progman.spec
RC_SRCS = rsrc.rc
all: check_wrc $(PROGRAMS)
all: check_wrc check_winestub $(PROGRAMS)
@MAKE_RULES@
......@@ -30,7 +32,7 @@ all: check_wrc $(PROGRAMS)
.rc.s:
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -o $*.s
progman: $(OBJS) $(WINESTUB)
progman: $(OBJS)
$(CC) -o progman $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
install::
......
name progman
mode guiexe
type win32
init WinMain
rsrc progman
......@@ -6,17 +6,18 @@ VPATH = @srcdir@
MODULE = none
PROGRAMS = regapi
ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
RCFLAGS = -w32 -h
WRCEXTRA = -t -A -p $*
C_SRCS = \
regapi.c
all: $(PROGRAMS)
SPEC_SRCS = \
regapi.spec
all: check_winestub $(PROGRAMS)
@MAKE_RULES@
regapi: $(OBJS) $(WINESTUB)
regapi: $(OBJS)
$(CC) -o regapi $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
install::
......
name regapi
mode guiexe
type win32
init WinMain
......@@ -6,16 +6,16 @@ VPATH = @srcdir@
MODULE = none
PROGRAMS = regtest
ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
RCFLAGS = -w32 -h
WRCEXTRA = -t -A -p $*
C_SRCS = regtest.c
all: $(PROGRAMS)
SPEC_SRCS = regtest.spec
all: check_winestub $(PROGRAMS)
@MAKE_RULES@
regtest: $(OBJS) $(WINESTUB)
regtest: $(OBJS)
$(CC) -o regtest $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
install::
......
name regtest
mode guiexe
type win32
init WinMain
Makefile
view
viewrc.h
view.spec.c
viewrc.s
......@@ -6,32 +6,24 @@ VPATH = @srcdir@
MODULE = none
PROGRAMS = view
ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
RCFLAGS = -w32 -h
WRCEXTRA = -t -A -p $*
WRCEXTRA = -s -p view
C_SRCS = \
init.c \
view.c \
winmain.c
SPEC_SRCS = \
view.spec
RC_SRCS = \
viewrc.rc
all: check_wrc $(PROGRAMS)
depend:: $(RC_SRCS:.rc=.h)
all: check_wrc check_winestub $(PROGRAMS)
@MAKE_RULES@
# Override resource compiler rules
.rc.s:
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -o $*.s
.rc.h:
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -nH $*.h
view: $(OBJS) $(WINESTUB)
view: $(OBJS)
$(CC) -o view $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
install::
......@@ -40,6 +32,4 @@ install::
uninstall::
$(RM) $(bindir)/view
$(RC_SRCS:.rc=.s): $(WRC)
### Dependencies:
name view
mode guiexe
type win32
init WinMain
rsrc view
Makefile
wcmd
wcmdrc.h
wcmd.spec.c
wcmdrc.s
......@@ -6,8 +6,7 @@ VPATH = @srcdir@
MODULE = none
PROGRAMS = wcmd
ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
RCFLAGS = -w32 -h
WRCEXTRA = -A -t -p $*
WRCEXTRA = -s -p wcmd
C_SRCS = \
batch.c \
......@@ -15,19 +14,20 @@ C_SRCS = \
directory.c \
wcmdmain.c
SPEC_SRCS = \
wcmd.spec
RC_SRCS = \
wcmdrc.rc
all: check_wrc $(PROGRAMS)
depend:: $(RC_SRCS:.rc=.h)
@MAKE_RULES@
#this line is needed to prevent winestub.o being linked
WINESTUB =
wcmd: $(OBJS) $(WINESTUB)
wcmd: $(OBJS)
$(CC) -o wcmd $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
install::
......@@ -36,6 +36,4 @@ install::
uninstall::
$(RM) $(bindir)/wcmd
$(RC_SRCS:.rc=.s): $(WRC)
### Dependencies:
name wcmd
mode cuiexe
type win32
init main
Da.h
Da.s
De.h
De.s
En.h
En.s
Es.h
Es.s
Fi.h
Fi.s
Fr.h
Fr.s
Hu.h
Hu.s
It.h
It.s
Ko.h
Ko.s
Makefile
Pt.h
Pt.s
Sw.h
Sw.s
Va.h
Va.s
Wa.h
Wa.s
hlp2sgml
lex.yy.c
rsrc.s
winhelp
winhelp.spec.c
y.tab.c
y.tab.h
......@@ -6,7 +6,7 @@ VPATH = @srcdir@
MODULE = none
PROGRAMS = winhelp hlp2sgml
ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
WRCEXTRA = -t -A -p winhelp
WRCEXTRA = -s -p winhelp
C_SRCS = \
winhelp.c \
......@@ -14,12 +14,14 @@ C_SRCS = \
macro.c \
string.c
SPEC_SRCS = winhelp.spec
EXTRA_SRCS = macro.yacc.y macro.lex.l
EXTRA_OBJS = y.tab.o lex.yy.o
RC_SRCS = rsrc.rc
all: check_wrc $(PROGRAMS)
all: check_wrc check_winestub $(PROGRAMS)
depend:: y.tab.h
......@@ -29,7 +31,7 @@ depend:: y.tab.h
.rc.s:
$(CPP) $(DEFS) $(OPTIONS) $(DIVINCL) -DRC_INVOKED -P -x c $< | $(WRC) $(WRCFLAGS) $(WRCEXTRA) -o $*.s
winhelp: $(OBJS) $(WINESTUB)
winhelp: $(OBJS)
$(CC) -o winhelp $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
hlp2sgml: hlp2sgml.o hlpfile.o
......
name winhelp
mode guiexe
type win32
init WinMain
rsrc winhelp
......@@ -6,16 +6,16 @@ VPATH = @srcdir@
MODULE = none
PROGRAMS = winver
ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
RCFLAGS = -w32 -h
WRCEXTRA = -t -A -p $*
C_SRCS = winver.c
all: check_wrc $(PROGRAMS)
SPEC_SRCS = winver.spec
all: check_winestub $(PROGRAMS)
@MAKE_RULES@
winver: $(OBJS) $(WINESTUB)
winver: $(OBJS)
$(CC) -o winver $(OBJS) $(LDOPTIONS) $(ALL_LIBS)
install::
......
name winver
mode guiexe
type win32
init WinMain
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment