diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 100 |
1 files changed, 59 insertions, 41 deletions
diff --git a/Makefile.am b/Makefile.am index 0dd2053..f29e863 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,9 @@ AUTOMAKE_OPTIONS = foreign no-dependencies no-dist +AM_CFLAGS = $(cairo_CFLAGS) $(fontconfig_CFLAGS) ${GS_CFLAGS} +LIBS += $(cairo_LIBS) $(fontconfig_LIBS) ${GS_LIBS} + # Additional files to distribute EXTRA_DIST = COPYRIGHT README README.ISOLatin2 README.notes @@ -18,40 +21,6 @@ INSTALL_TARGET = @INSTALL_TARGET@ # source files for Xcircuit noinst_PROGRAMS = menudep$(EXEEXT) -menudep$(EXEEXT): menudep.o - $(CC) -o $@ menudep.o - -menudep.h: menudep$(EXEEXT) - ./menudep$(EXEEXT) - -xcwrap.o: xcwrap.c menudep.h - $(CC) ${CPPFLAGS} ${CFLAGS} ${DEFS} $(PATHNAMES) $(INCLUDES) \ - xcwrap.c -c -o xcwrap.o - -lib/tcl/xcircuit${SHDLIB_EXT}: xcwrap.o ${xcircuit_OBJECTS} ${xcircuit_DEPEND} - $(RM) lib/xcircuit${SHDLIB_EXT} - $(CC) ${CFLAGS} ${SHLIB_CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o \ - ${xcircuit_OBJECTS} ${xcircuit_LDADD} ${SHLIB_LIB_SPECS} \ - ${LDFLAGS} ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS} \ - ${LIB_SPECS} ${EXTRA_LIB_SPECS} - -xcircexec$(EXEEXT): xcircexec.o - $(RM) ./xcircexec$(EXEEXT) - $(CC) ${CFLAGS} ${CPPFLAGS} ${DEFS} $(PATHNAMES) $(INCLUDES) \ - xcircexec.c -o xcircexec$(EXEEXT) ${LIB_SPECS} \ - ${LD_RUN_PATH} ${LDFLAGS} ${LIBS} ${EXTRA_LIB_SPECS} - -tcl: - @echo Making tcl library object - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (echo "Making tcl in $$subdir"; \ - cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)) \ - done - $(MAKE) lib/tcl/xcircuit${SHDLIB_EXT} - $(MAKE) lib/$(INTERP_PATH)/$(WRAPPER_SH) - $(MAKE) lib/$(INTERP_PATH)/$(WRAPPER_INIT) - $(MAKE) xcircexec$(EXEEXT) - # Automake files ac_aux_dir = dist @@ -76,6 +45,9 @@ PATHNAMES = -DPROG_VERSION=$(VERSION) \ -DUSER_RC_FILE=\"$(USER_RC_FILE)\" \ -DPROLOGUE_DIR=\"$(librarydir)\" \ -DPROLOGUE_FILE=\"$(PROLOGUE_FILE)\" \ + -DCYRILLIC_ENC_FILE=\"$(CYRILLIC_ENC_FILE)\" \ + -DISOLATIN2_ENC_FILE=\"$(ISOLATIN2_ENC_FILE)\" \ + -DISOLATIN5_ENC_FILE=\"$(ISOLATIN5_ENC_FILE)\" \ -DSTARTUP_FILE=\"$(STARTUP_FILE)\" \ -DLGF_LIB=\"$(LGF_LIB)\" \ -DASG_SPICE_LIB=\"$(ASG_SPICE_LIB)\" @@ -83,9 +55,16 @@ PATHNAMES = -DPROG_VERSION=$(VERSION) \ xcircuit_SOURCES = elements.c events.c filelist.c files.c \ flate.c fontfile.c formats.c functions.c graphic.c \ help.c keybindings.c libraries.c menucalls.c \ - netlist.c ngspice.c opengl.c parameter.c python.c \ + netlist.c ngspice.c parameter.c python.c \ rcfile.c render.c schema.c selection.c svg.c text.c undo.c \ - tclxcircuit.c tkSimple.c xcircuit.c xtfuncs.c xtgui.c + tclxcircuit.c tkSimple.c xcircuit.c xtfuncs.c xtgui.c \ + cairo.c utf8encodings.c +cairo.$(OBJEXT) : CFLAGS += -pedantic -Wall -Wextra +elements.$(OBJEXT) : CFLAGS += -pedantic -Wall -Wextra +events.$(OBJEXT) : CFLAGS += -pedantic -Wall -Wextra +fontfile.$(OBJEXT) : CFLAGS += -pedantic -Wall -Wextra +text.$(OBJEXT) : CFLAGS += -pedantic -Wall -Wextra +utf8encodings.$(OBJEXT) : CFLAGS += -pedantic -Wall -Wextra xcircuit_DEPEND = @SUBLIB@ xcircuit_LDADD = @SUBLIB@ @STDLIBS@ @@ -110,7 +89,6 @@ DEFS = @DEFS@ $(PATHNAMES) INCLUDES = -IXw ${INC_SPECS} SHDLIB_EXT = @SHDLIB_EXT@ LDDL_FLAGS = @LDDL_FLAGS@ -SHLIB_CFLAGS = @SHLIB_CFLAGS@ LDFLAGS = @LDFLAGS@ EXTRA_LIB_SPECS = @EXTRA_LIB_SPECS@ TCL_LIB_DIR = @TCL_LIB_DIR@ @@ -122,6 +100,10 @@ librarydir = $(libdir)/$(PACKAGE)-$(VERSION) scriptsdir = $(libdir)/$(PACKAGE)-$(VERSION) USER_RC_FILE = .xcircuitrc PROLOGUE_FILE = xcircps2.pro +CYRILLIC_ENC_FILE = cyrillic.enc +ISOLATIN2_ENC_FILE = isolatin2.enc +ISOLATIN5_ENC_FILE = isolatin5.enc +ENCODING_FILES = ${CYRILLIC_ENC_FILE} ${ISOLATIN2_ENC_FILE} ${ISOLATIN5_ENC_FILE} LGF_LIB = lgf.lps ASG_SPICE_LIB = asg_spice.lps SIGNAL_LIB = signal.lps @@ -132,9 +114,10 @@ INTERP_PATH = @INTERP_PATH@ FONTS_LPS = courier courieriso2 courieriso5 helvetica helveticaiso2 \ helveticaiso5 myfont symbol times_roman times_romaniso2 \ times_romaniso5 -FONTS_XFE = courier courieriso courieriso2 courieriso5 helvetica \ - helveticaiso helveticaiso2 helveticaiso5 myfont symbol \ - times_roman times_romaniso times_romaniso2 times_romaniso5 +FONTS_XFE = courier courieriso courieriso2 courieriso5 courier_cyrillic \ + helvetica helveticaiso helveticaiso2 helveticaiso5 helvetica_cyrillic \ + times_roman times_romaniso times_romaniso2 times_romaniso5 \ + times_roman_cyrillic myfont symbol SCRIPTS_PY = spice gettext pagebbox WRAPPER_INIT = xcircuit.tcl @@ -144,6 +127,41 @@ WRAPPER_SH = xcircuit.sh CONSOLE = tkcon.tcl CONSOLE_SCRIPT = console.tcl +menudep$(EXEEXT): menudep.o + $(CC) -o $@ menudep.o + +menudep.h: menudep$(EXEEXT) + ./menudep$(EXEEXT) + +xcwrap.o: xcwrap.c menudep.h + $(CC) ${CPPFLAGS} ${CFLAGS} ${DEFS} \ + $(PATHNAMES) $(INCLUDES) \ + xcwrap.c -c -o xcwrap.o + +lib/$(INTERP_PATH)/$(WRAPPER_OBJ): xcwrap.o ${xcircuit_OBJECTS} ${xcircuit_DEPEND} + $(RM) lib/$(INTERP_PATH)/$(WRAPPER_OBJ) + $(SHLIB_LD) ${CFLAGS} -o $@ ${LDDL_FLAGS} xcwrap.o \ + ${xcircuit_OBJECTS} ${xcircuit_LDADD} ${SHLIB_LIB_SPECS} \ + ${LDFLAGS} ${X_EXTRA_LIBS} ${EXTRA_LIBS} -lc ${LIBS} \ + ${LIB_SPECS} ${EXTRA_LIB_SPECS} + +xcircexec$(EXEEXT): xcircexec.o + $(RM) ./xcircexec$(EXEEXT) + $(CC) ${CFLAGS} ${CPPFLAGS} ${DEFS} $(PATHNAMES) $(INCLUDES) \ + xcircexec.c -o xcircexec$(EXEEXT) ${LIB_SPECS} \ + ${LD_RUN_PATH} ${LDFLAGS} ${LIBS} ${EXTRA_LIB_SPECS} + +tcl: + @echo Making tcl library object + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (echo "Making tcl in $$subdir"; \ + cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)) \ + done + $(MAKE) lib/$(INTERP_PATH)/$(WRAPPER_OBJ) + $(MAKE) lib/$(INTERP_PATH)/$(WRAPPER_SH) + $(MAKE) lib/$(INTERP_PATH)/$(WRAPPER_INIT) + $(MAKE) xcircexec$(EXEEXT) + lib/$(INTERP_PATH)/$(WRAPPER_SH): lib/$(INTERP_PATH)/$(WRAPPER_SH).in sed -e '/XCLIBDIR/s#XCLIBDIR#$(librarydir)#' \ -e '/WRAPPER_INIT/s/WRAPPER_INIT/$(WRAPPER_INIT)/' \ @@ -180,7 +198,7 @@ install-data-local: lib/xcircuit.1 $(INSTALL_DATA) lib/xcircuit.1 $(DESTDIR)$(appmandir)/xcircuit.1 @echo "Installing library and netlist files" $(mkinstalldirs) $(DESTDIR)$(librarydir) - ( cd lib ; for i in $(PROLOGUE_FILE) *.lps *.cir; do \ + ( cd lib ; for i in $(PROLOGUE_FILE) $(ENCODING_FILES) *.lps *.cir; do \ $(INSTALL_DATA) $$i $(DESTDIR)$(librarydir); \ done ) ( cd lib/$(INTERP_PATH) ; for i in $(STARTUP_FILE); do \ |