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

Updated all Makefiles to use .spec files and new resource handling.
This commit is contained in:
Ulrich Weigand 2000-02-03 01:37:23 +00:00 committed by Alexandre Julliard
parent 9ffd403001
commit 3dc5d9461e
53 changed files with 234 additions and 201 deletions

View File

@ -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

View File

@ -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 $*
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:

4
libtest/expand.spec Normal file
View File

@ -0,0 +1,4 @@
name expand
mode guiexe
type win32
init WinMain

4
libtest/hello.spec Normal file
View File

@ -0,0 +1,4 @@
name hello
mode guiexe
type win32
init WinMain

4
libtest/hello2.spec Normal file
View File

@ -0,0 +1,4 @@
name hello2
mode guiexe
type win32
init WinMain

5
libtest/hello3.spec Normal file
View File

@ -0,0 +1,5 @@
name hello3
mode guiexe
type win32
init WinMain
rsrc hello3res

4
libtest/hello4.spec Normal file
View File

@ -0,0 +1,4 @@
name hello4
mode guiexe
type win32
init WinMain

4
libtest/hello5.spec Normal file
View File

@ -0,0 +1,4 @@
name hello5
mode guiexe
type win32
init WinMain

4
libtest/new.spec Normal file
View File

@ -0,0 +1,4 @@
name new
mode guiexe
type win32
init WinMain

4
libtest/rolex.spec Normal file
View File

@ -0,0 +1,4 @@
name rolex
mode guiexe
type win32
init WinMain

4
libtest/vartest.spec Normal file
View File

@ -0,0 +1,4 @@
name vartest
mode guiexe
type win32
init WinMain

4
libtest/volinfo.spec Normal file
View File

@ -0,0 +1,4 @@
name volinfo
mode guiexe
type win32
init WinMain

View File

@ -1,4 +1,7 @@
Makefile
icinfo
icinfo.spec.c
aviplay
aviplay.spec.c
aviinfo
aviinfo.spec.c

View File

@ -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 $(WINESTUB)
$(CC) -o aviinfo aviinfo.o $(LDOPTIONS) $(ALL_LIBS)
aviplay: aviplay.o $(WINESTUB)
$(CC) -o aviplay aviplay.o $(LDOPTIONS) $(ALL_LIBS)
aviinfo: aviinfo.o aviinfo.spec.o
$(CC) -o aviinfo aviinfo.o aviinfo.spec.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

View File

@ -0,0 +1,4 @@
name aviinfo
mode guiexe
type win32
init WinMain

View File

@ -0,0 +1,4 @@
name aviplay
mode guiexe
type win32
init WinMain

View File

@ -0,0 +1,4 @@
name icinfo
mode guiexe
type win32
init WinMain

View File

@ -1,12 +1,4 @@
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

View File

@ -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::

View File

@ -0,0 +1,5 @@
name clock
mode guiexe
type win32
init WinMain
rsrc clock

View File

@ -1,4 +1,4 @@
Makefile
cmdlgr.h
cmdlgr.s
cmdlgtst
cmdlgtst.spec.c

View File

@ -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:

View File

@ -0,0 +1,5 @@
name cmdlgtst
mode guiexe
type win32
init WinMain
rsrc cmdlgtst

View File

@ -1,2 +1,3 @@
Makefile
control
control.spec.c

View File

@ -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::

View File

@ -0,0 +1,4 @@
name control
mode guiexe
type win32
init WinMain

View File

@ -1,11 +1,4 @@
Da.s
De.s
En.s
Es.s
Fi.s
Fr.s
Makefile
Pt.s
Sw.s
notepad
notepad.spec.c
rsrc.s

View File

@ -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::

View File

@ -0,0 +1,5 @@
name notepad
mode guiexe
type win32
init WinMain
rsrc notepad

View File

@ -1,2 +1,3 @@
Makefile
osversioncheck
osversioncheck.spec.c

View File

@ -9,6 +9,8 @@ ALL_LIBS = $(WINELIB) $(X_LIBS) $(XLIB) $(LIBS)
C_SRCS = osversioncheck.c
SPEC_SRCS = osversioncheck.spec
all: $(PROGRAMS)
@MAKE_RULES@

View File

@ -0,0 +1,4 @@
name osversioncheck
mode cuiexe
type win32
init main

View File

@ -1,31 +1,4 @@
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

View File

@ -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::

View File

@ -0,0 +1,5 @@
name progman
mode guiexe
type win32
init WinMain
rsrc progman

View File

@ -1,2 +1,3 @@
Makefile
regapi
regapi.spec.c

View File

@ -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::

View File

@ -0,0 +1,4 @@
name regapi
mode guiexe
type win32
init WinMain

View File

@ -1,2 +1,3 @@
Makefile
regtest
regtest.spec.c

View File

@ -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::

View File

@ -0,0 +1,4 @@
name regtest
mode guiexe
type win32
init WinMain

View File

@ -1,4 +1,4 @@
Makefile
view
viewrc.h
view.spec.c
viewrc.s

View File

@ -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:

5
programs/view/view.spec Normal file
View File

@ -0,0 +1,5 @@
name view
mode guiexe
type win32
init WinMain
rsrc view

View File

@ -1,4 +1,4 @@
Makefile
wcmd
wcmdrc.h
wcmd.spec.c
wcmdrc.s

View File

@ -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:

4
programs/wcmd/wcmd.spec Normal file
View File

@ -0,0 +1,4 @@
name wcmd
mode cuiexe
type win32
init main

View File

@ -1,33 +1,8 @@
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

View File

@ -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

View File

@ -0,0 +1,5 @@
name winhelp
mode guiexe
type win32
init WinMain
rsrc winhelp

View File

@ -1,2 +1,3 @@
Makefile
winver
winver.spec.c

View File

@ -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::

View File

@ -0,0 +1,4 @@
name winver
mode guiexe
type win32
init WinMain