diff options
| author | Guenter Knauf <lists@gknw.net> | 2010-08-06 03:42:18 +0200 |
|---|---|---|
| committer | Guenter Knauf <lists@gknw.net> | 2010-08-06 03:46:34 +0200 |
| commit | 9df82573016eb964a81c656f22263ff9f960974e (patch) | |
| tree | 8d8cb16e3c1566f4bee15abc2a80cafb95faab42 /lib | |
| parent | 992ceae386cc9452d5961c20e1ce23e57260fed2 (diff) | |
Some more Watcom makefile massage ...
For now removed the .autodepend directive until I've figured out
which of my changes broke it again.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.Watcom | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index 269de663e..be24a807e 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -10,7 +10,10 @@ SYS_INCL = -I$(%watcom)\h\nt -I$(%watcom)\h SYS_LIBS = $(%watcom)\lib386\nt;$(%watcom)\lib386 !endif -TARGETS = libcurl_wc.dll libcurl_wc_imp.lib libcurl_wc.lib +!ifndef %libname +LIBNAME = libcurl +!endif +TARGETS = $(LIBNAME).dll $(LIBNAME)_imp.lib $(LIBNAME).lib CC = wcc386 LD = wlink @@ -99,48 +102,48 @@ RESOURCE = $(OBJ_BASE)\dyn\libcurl.res all: $(CURLBUILDH) $(OBJ_BASE) $(TARGETS) .SYMBOLIC @echo Welcome to libcurl -$(OBJ_BASE): - -$(MD) $^@ - -$(MD) $^@\stat - -$(MD) $^@\dyn - -$(CURLBUILDH): .EXISTSONLY - $(CP) $^@.dist $^@ - -libcurl_wc.dll libcurl_wc_imp.lib: $(OBJS_DYN) $(RESOURCE) $(LINK_ARG) - $(LD) name libcurl_wc.dll @$(LINK_ARG) - -libcurl_wc.lib: $(OBJS_STAT) $(LIB_ARG) - $(AR) -q -b -c $^@ @$(LIB_ARG) - clean: .SYMBOLIC -$(RM) $(OBJS_STAT) -$(RM) $(OBJS_DYN) -$(RM) $(RESOURCE) $(LINK_ARG) $(LIB_ARG) vclean realclean: clean .SYMBOLIC - -$(RM) $(TARGETS) libcurl_wc.map + -$(RM) $(TARGETS) $(LIBNAME).map -$(RD) $(OBJ_BASE)\stat -$(RD) $(OBJ_BASE)\dyn -$(RD) $(OBJ_BASE) +$(OBJ_BASE): + -$(MD) $^@ + -$(MD) $^@\stat + -$(MD) $^@\dyn + +$(CURLBUILDH): .EXISTSONLY + $(CP) $^@.dist $^@ + +$(LIBNAME).dll: $(OBJS_DYN) $(RESOURCE) $(LINK_ARG) + $(LD) name $^@ @$]@ + +$(LIBNAME).lib: $(OBJS_STAT) $(LIB_ARG) + $(AR) -q -b -c $^@ @$]@ + .ERASE $(RESOURCE): libcurl.rc $(RC) $(DEBUG) -q -r -zm -I..\include $(SYS_INCL) $[@ -fo=$^@ .ERASE -.c{$(OBJ_BASE)\dyn}.obj: .AUTODEPEND +.c{$(OBJ_BASE)\dyn}.obj: $(CC) $(CFLAGS) -bd $[@ -fo=$^@ .ERASE -.c{$(OBJ_BASE)\stat}.obj: .AUTODEPEND +.c{$(OBJ_BASE)\stat}.obj: $(CC) $(CFLAGS) -DCURL_STATICLIB $[@ -fo=$^@ $(LINK_ARG): $(__MAKEFILES__) %create $^@ @%append $^@ system nt dll @%append $^@ file { $(OBJS_DYN) } - @%append $^@ option quiet, map, caseexact, eliminate, implib=libcurl_wc_imp.lib, + @%append $^@ option quiet, map, caseexact, eliminate, implib=$(LIBNAME)_imp.lib, @%append $^@ res=$(RESOURCE) libpath $(SYS_LIBS) # @%append $^@ library clib3r.lib @%append $^@ library wldap32.lib |