diff options
Diffstat (limited to 'pr/tests/dll/Makefile.in')
-rw-r--r-- | pr/tests/dll/Makefile.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pr/tests/dll/Makefile.in b/pr/tests/dll/Makefile.in index 3165224f..d90c411c 100644 --- a/pr/tests/dll/Makefile.in +++ b/pr/tests/dll/Makefile.in @@ -33,7 +33,9 @@ OPTIMIZER = endif endif -INCLUDES = -I$(DIST)/include +CSRCS = mygetval.c mysetval.c + +INCLUDES = -I$(dist_includedir) OBJS = $(OBJDIR)/mygetval.$(OBJ_SUFFIX) \ $(OBJDIR)/mysetval.$(OBJ_SUFFIX) @@ -43,7 +45,7 @@ W16OBJS = $(subst $(space),$(comma)$(space),$(OBJS)) endif ifeq ($(OS_ARCH), WINNT) -ifeq (,$(filter-out WIN16 OS2,$(OS_TARGET))) +ifeq ($(OS_TARGET), WIN16) # do nothing else DLLBASE=/BASE:0x30000000 @@ -52,10 +54,10 @@ RESNAME=../../../pr/src/nspr.rc endif endif -ifeq ($(OS_ARCH), WINNT) -IMPORT_LIBRARY = $(OBJDIR)/my.lib +ifeq (,$(filter-out WINNT OS2,$(OS_ARCH))) +IMPORT_LIBRARY = $(OBJDIR)/my.$(LIB_SUFFIX) SHARED_LIBRARY = $(OBJDIR)/my.dll -ifeq ($(OS_TARGET), OS2) +ifeq ($(OS_ARCH), OS2) LIBRARY = $(OBJDIR)/my_s.lib # XXX $(LIBRARY) probably doesn't need to be added to TARGETS. TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) @@ -92,7 +94,6 @@ ifdef SHARED_LIBRARY export:: $(TARGETS) $(NSINSTALL) $(TARGETS) ../$(OBJDIR)/dll -install:: export clean:: rm -rf $(TARGETS) |