From c6812111da8c4dc218f81c7f56fc7c62748aafd5 Mon Sep 17 00:00:00 2001 From: kgerickson Date: Mon, 7 Sep 2015 21:58:03 -0400 Subject: [PATCH] Remove the redundant NOT_MINGW conditional. Instead, just use MINGW or !MINGW as appropriate. --- configure | 15 --------------- configure.in | 2 -- javadispatcher/Makefile.am | 7 +++---- javadispatcher/Makefile.in | 6 +++--- javascope/Makefile.am | 6 +++--- javascope/Makefile.in | 14 +++++++------- javatraverser/Makefile.am | 10 ++++------ javatraverser/Makefile.in | 12 ++++++------ mdstcpip/zlib/Makefile.am | 3 +-- mdstcpip/zlib/Makefile.in | 6 +++--- scripts/Makefile.am | 2 +- scripts/Makefile.in | 8 ++++---- 12 files changed, 35 insertions(+), 56 deletions(-) diff --git a/configure b/configure index 855a2e8159..cbf537550f 100755 --- a/configure +++ b/configure @@ -713,8 +713,6 @@ D3DLIB D3D_PACKAGE CLOCK_GETTIME_LIB CAMSHR -NOT_MINGW_FALSE -NOT_MINGW_TRUE DOXYGEN_PAPER_SIZE DX_COND_latex_FALSE DX_COND_latex_TRUE @@ -13653,15 +13651,6 @@ else fi - if test "$MINGW" != "yes"; then - NOT_MINGW_TRUE= - NOT_MINGW_FALSE='#' -else - NOT_MINGW_TRUE='#' - NOT_MINGW_FALSE= -fi - - @@ -13987,10 +13976,6 @@ if test -z "${DX_COND_latex_TRUE}" && test -z "${DX_COND_latex_FALSE}"; then as_fn_error $? "conditional \"DX_COND_latex\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${NOT_MINGW_TRUE}" && test -z "${NOT_MINGW_FALSE}"; then - as_fn_error $? "conditional \"NOT_MINGW\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 diff --git a/configure.in b/configure.in index 94896ed463..84165d0345 100644 --- a/configure.in +++ b/configure.in @@ -1023,8 +1023,6 @@ XM_LIBS="-lMrm -lXm" AC_CHECK_LIB(Xext,XextAddDisplay,LIBXEXT="-lXext",LIBXEXT="") AC_CHECK_LIB(Xp,XpGetDocumentData,LIBXP="-lXp",LIBXP="") -AM_CONDITIONAL([NOT_MINGW], [test "$MINGW" != "yes"]) - AC_SUBST(CAMSHR) AC_SUBST(CLOCK_GETTIME_LIB) AC_SUBST(D3D_PACKAGE) diff --git a/javadispatcher/Makefile.am b/javadispatcher/Makefile.am index e1007e1e0b..fbc04e2f07 100644 --- a/javadispatcher/Makefile.am +++ b/javadispatcher/Makefile.am @@ -41,14 +41,13 @@ jDispatcher.jar: classjava.stamp CLEANFILES = $(CLASSES) jDispatcher.jar -if NOT_MINGW +if MINGW +bin_SCRIPTS = jDispatcherIp.bat jDispatchMonitor.bat jServer.bat +else bin_SCRIPTS = jDispatcherIp jDispatchMonitor jServer EXTRA_DIST = jDispatcherIp.template jDispatchMonitor.template jServer.template -else -bin_SCRIPTS = jDispatcherIp.bat jDispatchMonitor.bat jServer.bat endif - jDispatcherIp jDispatchMonitor jServer: %: %.template cp $^ $@ diff --git a/javadispatcher/Makefile.in b/javadispatcher/Makefile.in index ca5981bb2c..accaf84303 100644 --- a/javadispatcher/Makefile.in +++ b/javadispatcher/Makefile.in @@ -425,9 +425,9 @@ java_JAVA = Action.java ActionServer.java Balancer.java \ dist_java_DATA = jDispatcher.properties java_DATA = jDispatcher.jar CLEANFILES = $(CLASSES) jDispatcher.jar -@NOT_MINGW_FALSE@bin_SCRIPTS = jDispatcherIp.bat jDispatchMonitor.bat jServer.bat -@NOT_MINGW_TRUE@bin_SCRIPTS = jDispatcherIp jDispatchMonitor jServer -@NOT_MINGW_TRUE@EXTRA_DIST = jDispatcherIp.template jDispatchMonitor.template jServer.template +@MINGW_FALSE@bin_SCRIPTS = jDispatcherIp jDispatchMonitor jServer +@MINGW_TRUE@bin_SCRIPTS = jDispatcherIp.bat jDispatchMonitor.bat jServer.bat +@MINGW_FALSE@EXTRA_DIST = jDispatcherIp.template jDispatchMonitor.template jServer.template all: all-am .SUFFIXES: diff --git a/javascope/Makefile.am b/javascope/Makefile.am index dc56ff37f7..9b8c0d0c7d 100644 --- a/javascope/Makefile.am +++ b/javascope/Makefile.am @@ -6,7 +6,9 @@ MINDTERM = $(srcdir)/MindTerm.jar CLASSPATH_ENV = CLASSPATH=$(MINDTERM) # Create the shell script that runs the program -if NOT_MINGW +if MINGW +bin_SCRIPTS = jScope.bat +else bin_SCRIPTS = scripts/jScope EXTRA_DIST += jScope.template CLEANFILES += $(bin_SCRIPTS) @@ -14,8 +16,6 @@ CLEANFILES += $(bin_SCRIPTS) $(bin_SCRIPTS): jScope.template $(INSTALL) -d scripts $(INSTALL) $< $@ -else -bin_SCRIPTS = jScope.bat endif diff --git a/javascope/Makefile.in b/javascope/Makefile.in index 2475ce6dac..f1d4cfc088 100644 --- a/javascope/Makefile.in +++ b/javascope/Makefile.in @@ -90,8 +90,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@NOT_MINGW_TRUE@am__append_1 = jScope.template -@NOT_MINGW_TRUE@am__append_2 = $(bin_SCRIPTS) +@MINGW_FALSE@am__append_1 = jScope.template +@MINGW_FALSE@am__append_2 = $(bin_SCRIPTS) subdir = javascope ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_doxygen.m4 \ @@ -415,10 +415,10 @@ CLEANFILES = $(java_DATA) $(am__append_2) $(JSCOPE_CLASS) \ $(WAVEDISPLAY_CLASS) $(EXTRA_CLASS) MINDTERM = $(srcdir)/MindTerm.jar CLASSPATH_ENV = CLASSPATH=$(MINDTERM) -@NOT_MINGW_FALSE@bin_SCRIPTS = jScope.bat +@MINGW_FALSE@bin_SCRIPTS = scripts/jScope # Create the shell script that runs the program -@NOT_MINGW_TRUE@bin_SCRIPTS = scripts/jScope +@MINGW_TRUE@bin_SCRIPTS = jScope.bat # Documentation dist_docs_DATA = $(DOCS) @@ -838,9 +838,9 @@ uninstall-am: uninstall-binSCRIPTS uninstall-dist_docsDATA \ .PRECIOUS: Makefile -@NOT_MINGW_TRUE@$(bin_SCRIPTS): jScope.template -@NOT_MINGW_TRUE@ $(INSTALL) -d scripts -@NOT_MINGW_TRUE@ $(INSTALL) $< $@ +@MINGW_FALSE@$(bin_SCRIPTS): jScope.template +@MINGW_FALSE@ $(INSTALL) -d scripts +@MINGW_FALSE@ $(INSTALL) $< $@ $(java_DATA): classjava.stamp jScope.jar: colors1.tbl $(MKDIR_P) docs diff --git a/javatraverser/Makefile.am b/javatraverser/Makefile.am index 7c973eac9a..11719bf645 100644 --- a/javatraverser/Makefile.am +++ b/javatraverser/Makefile.am @@ -1,21 +1,19 @@ EXTRA_DIST = servlet-2_3-fcs-classfiles.zip CLEANFILES = $(java_DATA) -if NOT_MINGW -CLEANFILES += $(bin_SCRIPTS) -endif JAVAROOT = $(builddir) javadir = $(exec_prefix)/java/classes docsdir = $(exec_prefix)/java/classes/docs # Create the shell script that runs the program -if NOT_MINGW +if MINGW +bin_SCRIPTS = traverser.bat +else bin_SCRIPTS = jTraverser +CLEANFILES += $(bin_SCRIPTS) EXTRA_DIST += jTraverser.template $(bin_SCRIPTS): $(srcdir)/jTraverser.template cp $< $@ -else -bin_SCRIPTS = traverser.bat endif #$(INSTALL) -D $< $@ diff --git a/javatraverser/Makefile.in b/javatraverser/Makefile.in index df3114b575..f4ee172d8b 100644 --- a/javatraverser/Makefile.in +++ b/javatraverser/Makefile.in @@ -90,8 +90,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@NOT_MINGW_TRUE@am__append_1 = $(bin_SCRIPTS) -@NOT_MINGW_TRUE@am__append_2 = jTraverser.template +@MINGW_FALSE@am__append_1 = $(bin_SCRIPTS) +@MINGW_FALSE@am__append_2 = jTraverser.template subdir = javatraverser ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_doxygen.m4 \ @@ -429,10 +429,10 @@ CLEANFILES = $(java_DATA) $(am__append_1) JAVAROOT = $(builddir) javadir = $(exec_prefix)/java/classes docsdir = $(exec_prefix)/java/classes/docs -@NOT_MINGW_FALSE@bin_SCRIPTS = traverser.bat +@MINGW_FALSE@bin_SCRIPTS = jTraverser # Create the shell script that runs the program -@NOT_MINGW_TRUE@bin_SCRIPTS = jTraverser +@MINGW_TRUE@bin_SCRIPTS = traverser.bat #$(INSTALL) -D $< $@ # Build the class files @@ -942,8 +942,8 @@ uninstall-am: uninstall-binSCRIPTS uninstall-javaDATA \ .PRECIOUS: Makefile -@NOT_MINGW_TRUE@$(bin_SCRIPTS): $(srcdir)/jTraverser.template -@NOT_MINGW_TRUE@ cp $< $@ +@MINGW_FALSE@$(bin_SCRIPTS): $(srcdir)/jTraverser.template +@MINGW_FALSE@ cp $< $@ TreeServer_Stub.class: classjava.stamp $(RMIC) TreeServer diff --git a/mdstcpip/zlib/Makefile.am b/mdstcpip/zlib/Makefile.am index 876ea51600..10cd172783 100644 --- a/mdstcpip/zlib/Makefile.am +++ b/mdstcpip/zlib/Makefile.am @@ -2,8 +2,7 @@ include ${top_srcdir}/Makefile.inc -if NOT_MINGW -else +if MINGW EXE=.exe WIN=.win DEF=mdsipshr.def diff --git a/mdstcpip/zlib/Makefile.in b/mdstcpip/zlib/Makefile.in index f300ef0345..9f8eaf4a49 100644 --- a/mdstcpip/zlib/Makefile.in +++ b/mdstcpip/zlib/Makefile.in @@ -452,9 +452,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ uiddir = @uiddir@ -@NOT_MINGW_FALSE@EXE = .exe -@NOT_MINGW_FALSE@WIN = .win -@NOT_MINGW_FALSE@DEF = mdsipshr.def +@MINGW_TRUE@EXE = .exe +@MINGW_TRUE@WIN = .win +@MINGW_TRUE@DEF = mdsipshr.def lib = @LIBPRE@ _SOURCES = adler32.c \ compress.c \ diff --git a/scripts/Makefile.am b/scripts/Makefile.am index ae6ceeb782..ad1ef7e606 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,4 +1,4 @@ -if NOT_MINGW +if !MINGW dist_bin_SCRIPTS = job_finish dist_bin_SCRIPTS += job_functions dist_bin_SCRIPTS += job_output diff --git a/scripts/Makefile.in b/scripts/Makefile.in index abc8441cd8..82f793b505 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -405,10 +405,10 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ uiddir = @uiddir@ -@NOT_MINGW_TRUE@dist_bin_SCRIPTS = job_finish job_functions job_output \ -@NOT_MINGW_TRUE@ job_que job_start job_wait MonitorCpciData.py \ -@NOT_MINGW_TRUE@ remote_submit SetMdsplusFileProtection \ -@NOT_MINGW_TRUE@ synchronize_unix unix_submit +@MINGW_FALSE@dist_bin_SCRIPTS = job_finish job_functions job_output \ +@MINGW_FALSE@ job_que job_start job_wait MonitorCpciData.py \ +@MINGW_FALSE@ remote_submit SetMdsplusFileProtection \ +@MINGW_FALSE@ synchronize_unix unix_submit all: all-am .SUFFIXES: