diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-02-24 07:52:29 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-02-24 07:52:29 +0000 |
| commit | 60e637828328cb6e340997672819616ddf02c379 (patch) | |
| tree | 48c4d0455e2d0c84178ad8cc6def42b390048f54 | |
| parent | 3dbaeec35f85d50dbc1f39a772d0add45a0f5a74 (diff) | |
| download | netpbm-mirror-60e637828328cb6e340997672819616ddf02c379.tar.gz netpbm-mirror-60e637828328cb6e340997672819616ddf02c379.tar.xz netpbm-mirror-60e637828328cb6e340997672819616ddf02c379.zip | |
consistently use upper case Y in boolean make file variables
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2137 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rwxr-xr-x | buildtools/configure.pl | 4 | ||||
| -rw-r--r-- | converter/ppm/ppmtompeg/Makefile | 2 | ||||
| -rw-r--r-- | lib/Makefile | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/buildtools/configure.pl b/buildtools/configure.pl index b03630d8..c86064df 100755 --- a/buildtools/configure.pl +++ b/buildtools/configure.pl @@ -2289,7 +2289,7 @@ if ($platform eq "GNU") { # only Ppmtompeg and it isn't clear that using long instead of int is # ever right anyway. - push(@config_mk, "OMIT_NETWORK = y\n"); + push(@config_mk, "OMIT_NETWORK = Y\n"); push(@config_mk, "LINKER_CAN_DO_EXPLICIT_LIBRARY=Y\n"); } elsif ($platform eq "IRIX") { # push(@config_mk, "INSTALL = install\n"); @@ -2303,7 +2303,7 @@ if ($platform eq "GNU") { makeCompilerGcc(\@config_mk); } push(@config_mk, "EXE = .exe\n"); - push(@config_mk, "OMIT_NETWORK = y\n"); + push(@config_mk, "OMIT_NETWORK = Y\n"); # # Though it may not have the link as "ginstall", "install" in a Windows # # Unix environment is usually GNU install. # my $ginstall_result = `ginstall --version 2>/dev/null`; diff --git a/converter/ppm/ppmtompeg/Makefile b/converter/ppm/ppmtompeg/Makefile index a1004fdd..4f244ae9 100644 --- a/converter/ppm/ppmtompeg/Makefile +++ b/converter/ppm/ppmtompeg/Makefile @@ -51,7 +51,7 @@ MP_ENCODE_OBJS = \ MP_OTHER_OBJS = mpeg.o subsample.o param.o rgbtoycc.o \ readframe.o combine.o jrevdct.o frame.o fsize.o frametype.o \ specifics.o rate.o opts.o input.o -ifeq ($(OMIT_NETWORK),y) +ifeq ($(OMIT_NETWORK),Y) MP_OTHER_OBJS += noparallel.o else MP_OTHER_OBJS += parallel.o psocket.o diff --git a/lib/Makefile b/lib/Makefile index 81df510e..d5f47813 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -13,7 +13,7 @@ else LIBNETPBM = $(NETPBMSHLIBPREFIX)netpbm$(DLLVER).$(NETPBMLIBSUFFIX) endif -ifeq ($(STATICLIB_TOO),y) +ifeq ($(STATICLIB_TOO),Y) EXTRA_STATICLIB = libnetpbm.$(STATICLIBSUFFIX) else EXTRA_STATICLIB = @@ -130,7 +130,7 @@ libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) endif ifeq ($(NETPBMLIBTYPE),dll) -ifeq ($(STATICLIB_TOO),y) +ifeq ($(STATICLIB_TOO),Y) $(NETPBMSHLIBPREFIX)netpbm$(DLLVER).dll: $(LIBOBJECTS) $(LIBOBJECTS_X) libnetpbm.$(STATICLIBSUFFIX) else $(NETPBMSHLIBPREFIX)netpbm$(DLLVER).dll: $(LIBOBJECTS) $(LIBOBJECTS_X) @@ -170,16 +170,16 @@ endif # STATICLIB_SUFFIX may just be arbitrary. #----------------------------------------------------------------------------- ifeq ($(NETPBMLIBTYPE),unixstatic) - BUILD_STATICLIB = y + BUILD_STATICLIB = Y else - ifeq ($(STATICLIB_TOO),y) - BUILD_STATICLIB = y + ifeq ($(STATICLIB_TOO),Y) + BUILD_STATICLIB = Y else BUILD_STATICLIB = n endif endif -ifeq ($(BUILD_STATICLIB),y) +ifeq ($(BUILD_STATICLIB),Y) libnetpbm.$(STATICLIBSUFFIX): $(LIBOBJECTS) $(LIBOBJECTS_X) -rm -f $@ $(AR) rc $@ $(LIBOBJECTS) $(LIBOBJECTS_X) |