HEYAHONG/emu8051
1
0
Fork 0
mirror of https://github.com/HEYAHONG/emu8051.git synced 2025-05-08 22:09:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add option no-define to AM_INIT_AUTOMAKE

Browse Source 
No need to define all variables on the compiler command line since
they are already defined in the config.h header file.
This commit is contained in:
Hugo Villeneuve 2014-04-06 22:36:16 -04:00
parent b89d7661e7
commit f7e3f1d8d0
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -7,7 +7,7 @@ AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR(src/common/cpu8051.c)
dnl Checking if the NEWS file has been updated to reflect the current version.
AM_INIT_AUTOMAKE(check-news -Wall std-options color-tests parallel-tests)
AM_INIT_AUTOMAKE(no-define check-news -Wall std-options color-tests parallel-tests)
AM_SILENT_RULES([yes])
AM_CONFIG_HEADER(config.h:config-h.in)

4
src/common/common.h
View File

@ -10,6 +10,10 @@
#ifndef COMMON_H
#define COMMON_H 1
#if HAVE_CONFIG_H
# include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>

4
src/gtk/app-config.c
View File

@ -103,7 +103,7 @@ app_config_get_dir_path(void)
{
char *dir_path;
dir_path = g_build_filename(g_get_user_config_dir(), PACKAGE,
dir_path = g_build_filename(g_get_user_config_dir(), PACKAGE_NAME,
profile_name, NULL);
return dir_path;
@ -116,7 +116,7 @@ app_config_get_file_path(void)
char *dir_path;
char file[MAX_FILENAME_LENGTH];
sprintf(file, "%s.conf", PACKAGE);
sprintf(file, "%s.conf", PACKAGE_NAME);
dir_path = app_config_get_dir_path();

2
src/gtk/helpmenu.c
View File

@ -82,7 +82,7 @@ help_add_menu(GtkWidget *menu_bar)
menu = gtk_menu_new();
/* Create the 'Help About' item. */
item = gtk_menu_item_new_with_label("About " PACKAGE);
item = gtk_menu_item_new_with_label("About " PACKAGE_NAME);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
/* Attach the callback functions to the activate signal. */
g_signal_connect(item, "activate", G_CALLBACK(help_about_event), NULL);

2
src/gtk/main.c
View File

@ -479,7 +479,7 @@ emugtk_window_init(void)
emugtk_window_init_complete = false;
mainwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(mainwin), PACKAGE);
gtk_window_set_title(GTK_WINDOW(mainwin), PACKAGE_NAME);
gtk_window_set_default_size(GTK_WINDOW(mainwin),
cfg->win_width, cfg->win_height);
gtk_container_set_border_width(GTK_CONTAINER(mainwin), 0);